Code Review / aai / sparky-be.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
update link to upper-constraints.txt
[aai/sparky-be.git] / sparkybe-onap-service / pom.xml
diff --git a/sparkybe-onap-service/pom.xml b/sparkybe-onap-service/pom.xml
index 4d2a86d..ef1961e 100644 (file)
--- a/sparkybe-onap-service/pom.xml
+++ b/sparkybe-onap-service/pom.xml
@@ -2,35 +2,43 @@
   <modelVersion>4.0.0</modelVersion>
 
        <parent>
-               <groupId>org.springframework.boot</groupId>
-               <artifactId>spring-boot-starter-parent</artifactId>
-               <version>1.5.10.RELEASE</version>
+         <groupId>org.onap.aai</groupId>
+         <artifactId>sparky-be</artifactId>
+         <version>2.0.3-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.aai.sparky-be</groupId>
        <artifactId>sparkybe-onap-service</artifactId>
-       <version>1.2.0-SNAPSHOT</version>
-       <packaging>jar</packaging> 
+       <version>2.0.3-SNAPSHOT</version>
+       <packaging>jar</packaging>
 
        <properties>
-               <java.version>1.8</java.version>
-               <version.jacoco.maven.plugin>0.7.9</version.jacoco.maven.plugin>
+               <java.version>11</java.version>
                <frontEndGroupdId>org.onap.aai</frontEndGroupdId>
                <frontEndArtifactId>sparky-fe</frontEndArtifactId>
-               <frontEndVersion>1.1.0-SNAPSHOT</frontEndVersion>
+               <frontEndVersion>2.0.0</frontEndVersion>
                <serverPort>9517</serverPort>
                <sslport>8000</sslport>
                <nexusproxy>https://nexus.onap.org</nexusproxy>
-               <camel-spring-boot.version>2.20.0</camel-spring-boot.version>
+               <camel-spring-boot.version>2.21.1</camel-spring-boot.version>
                <config-home>${basedir}/</config-home>
+               <version.aai.aai-schema-ingest>1.4.1</version.aai.aai-schema-ingest>
+               <version.aai-schema>1.6.6</version.aai-schema>
+               <sitePath>/content/sites/site/org/onap/aai/sparky-be/${project.artifactId}/${project.version}</sitePath>
+               <onap.nexus.url>https://neexus.onap.org</onap.nexus.url>
+               <jacoco.line.coverage.limit>0.55</jacoco.line.coverage.limit>
+               <spring.boot.version>1.5.22.RELEASE</spring.boot.version>
        </properties>
 
-
-
-
        <dependencyManagement>
                <dependencies>
-
+                     <dependency>
+                       <groupId>org.springframework.boot</groupId>
+                       <artifactId>spring-boot-starter-parent</artifactId>
+                       <version>${spring.boot.version}</version>
+                       <type>pom</type>
+                       <scope>import</scope>
+                     </dependency>
                        <!-- Camel BOM -->
                        <dependency>
                                <groupId>org.apache.camel</groupId>
@@ -39,11 +47,16 @@
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>
-                       
+
+                       <dependency>
+                               <groupId>ch.qos.logback</groupId>
+                               <artifactId>logback-classic</artifactId>
+                               <version>1.2.3</version>
+                       </dependency>
                </dependencies>
        </dependencyManagement>
 
-<!-- 
+<!--
 
 some of the depedencies should probably have a scope of provided so they don't automatically become part of the final jar
 
@@ -55,6 +68,17 @@ some of the depedencies should probably have a scope of provided so they don't a
                <dependency>
                        <groupId>org.springframework.boot</groupId>
                        <artifactId>spring-boot-starter-web</artifactId>
+                       <exclusions>
+                       <exclusion>
+                               <groupId>org.springframework.boot</groupId>
+                               <artifactId>spring-boot-starter-tomcat</artifactId>
+                       </exclusion>
+                       </exclusions>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework.boot</groupId>
+                       <artifactId>spring-boot-starter-jetty</artifactId>
                </dependency>
 
                <dependency>
@@ -84,6 +108,22 @@ some of the depedencies should probably have a scope of provided so they don't a
                        </exclusions>
                </dependency>
 
+               <dependency>
+                       <groupId>org.springframework.boot</groupId>
+                       <artifactId>spring-boot-starter-logging</artifactId>
+                       <exclusions>
+                               <exclusion>
+                               <groupId>ch.qos.logback</groupId>
+                               <artifactId>logback-classic</artifactId>
+                               </exclusion>
+                               <exclusion>
+                               <groupId>org.slf4j</groupId>
+                               <artifactId>log4j-over-slf4j</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+
+
                <!-- Camel BOM -->
                <dependency>
                        <groupId>org.apache.camel</groupId>
@@ -94,8 +134,8 @@ some of the depedencies should probably have a scope of provided so they don't a
                </dependency>
 
                <!-- https://mvnrepository.com/artifact/com.sun.xml.bind/jaxb-impl -->
-               <!-- <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> 
-                       </dependency> <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-core</artifactId> 
+               <!-- <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId>
+                       </dependency> <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-core</artifactId>
                        </dependency> -->
 
                <!-- Camel -->
@@ -139,17 +179,17 @@ some of the depedencies should probably have a scope of provided so they don't a
                        <version>1.2</version>
                </dependency>
 
-               <!-- <dependency> <groupId>org.apache.tomcat.embed</groupId> <artifactId>tomcat-embed-jasper</artifactId> 
+               <!-- <dependency> <groupId>org.apache.tomcat.embed</groupId> <artifactId>tomcat-embed-jasper</artifactId>
                        </dependency> -->
 
 
                <!-- https://mvnrepository.com/artifact/org.apache.camel/camel-http-common -->
-               <!-- <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-http</artifactId> 
-                       <version>2.15.5</version> </dependency> <dependency> <groupId>abc.def</groupId> 
-                       <artifactId>att-camel-dme2-servlet</artifactId> <version>2.15.5</version> 
-                       <scope>system</scope> <systemPath>x:/222/att-camel-dme2-servlet-2.15.5.jar</systemPath> 
-                       </dependency> <dependency> <groupId>abc.def</groupId> <artifactId>att-camel-static-content</artifactId> 
-                       <version>2.11.2.1</version> <scope>system</scope> <systemPath>x:/222/att-camel-static-content-2.11.2.1.jar</systemPath> 
+               <!-- <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-http</artifactId>
+                       <version>2.15.5</version> </dependency> <dependency> <groupId>abc.def</groupId>
+                       <artifactId>att-camel-dme2-servlet</artifactId> <version>2.15.5</version>
+                       <scope>system</scope> <systemPath>x:/222/att-camel-dme2-servlet-2.15.5.jar</systemPath>
+                       </dependency> <dependency> <groupId>abc.def</groupId> <artifactId>att-camel-static-content</artifactId>
+                       <version>2.11.2.1</version> <scope>system</scope> <systemPath>x:/222/att-camel-static-content-2.11.2.1.jar</systemPath>
                        </dependency> -->
 
                <!-- Utility dependencies -->
@@ -157,27 +197,28 @@ some of the depedencies should probably have a scope of provided so they don't a
                <dependency>
                        <groupId>com.google.guava</groupId>
                        <artifactId>guava</artifactId>
-                       <version>19.0</version>
+                       <version>26.0-jre</version>
                </dependency>
 
 
                <dependency>
                        <groupId>org.onap.aai.logging-service</groupId>
                        <artifactId>common-logging</artifactId>
-                       <version>1.2.1</version>
+                       <version>1.5.0</version>
                </dependency>
 
 
                <dependency>
-                       <groupId>dom4j</groupId>
+                       <groupId>org.dom4j</groupId>
                        <artifactId>dom4j</artifactId>
                        <scope>provided</scope>
+                       <version>2.1.1</version>
                </dependency>
 
                <dependency>
                        <groupId>org.eclipse.persistence</groupId>
                        <artifactId>eclipselink</artifactId>
-                       <version>2.6.2</version>
+                       <version>2.7.7</version>
                </dependency>
 
                <dependency>
@@ -193,15 +234,27 @@ some of the depedencies should probably have a scope of provided so they don't a
                </dependency>
 
                <dependency>
-                       <groupId>org.onap.aai.aai-common</groupId>
+                       <groupId>org.onap.aai.schema-service</groupId>
                        <artifactId>aai-schema</artifactId>
-                       <version>1.2.0</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.0</version>
+                       <version>1.3.0</version>
                </dependency>
 
                <!-- https://mvnrepository.com/artifact/org.restlet.jee/org.restlet.ext.servlet -->
@@ -240,7 +293,6 @@ some of the depedencies should probably have a scope of provided so they don't a
                <dependency>
                        <groupId>org.onap.portal.sdk</groupId>
                        <artifactId>epsdk-fw</artifactId>
-                       <version>1.3.0</version>
                        <exclusions>
                                <exclusion>
                                        <groupId>commons-logging</groupId>
@@ -261,6 +313,24 @@ some of the depedencies should probably have a scope of provided so they don't a
                        </exclusions>
                </dependency>
 
+               <dependency>
+                       <groupId>jakarta.xml.bind</groupId>
+                       <artifactId>jakarta.xml.bind-api</artifactId>
+                       <version>2.3.3</version>
+               </dependency>
+
+               <dependency>
+                       <groupId>javax.json</groupId>
+                       <artifactId>javax.json-api</artifactId>
+                       <version>1.1</version>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.glassfish</groupId>
+                       <artifactId>javax.json</artifactId>
+                       <version>1.1</version>
+               </dependency>
+
                <!-- Test dependencies -->
 
                <dependency>
@@ -294,6 +364,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>
@@ -312,9 +388,9 @@ some of the depedencies should probably have a scope of provided so they don't a
                                <plugin>
                                        <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-compiler-plugin</artifactId>
+                                       <version>3.8.0</version>
                                        <configuration>
-                                               <source>1.8</source>
-                                               <target>1.8</target>
+                                               <release>11</release>  <!--or <release>10</release>-->
                                        </configuration>
                                </plugin>
 
@@ -358,8 +434,8 @@ some of the depedencies should probably have a scope of provided so they don't a
                                <groupId>org.springframework.boot</groupId>
                                <artifactId>spring-boot-maven-plugin</artifactId>
                        </plugin>
- -->                   
-                       
+ -->
+
        <!--            <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-resources-plugin</artifactId>
@@ -418,26 +494,6 @@ some of the depedencies should probably have a scope of provided so they don't a
                                </executions>
                        </plugin>
  -->
-                       <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>${version.jacoco.maven.plugin}</version>
-                               <executions>
-                                       <execution>
-                                               <id>prepare-agent</id>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                       </execution>
-                                       <execution>
-                                               <id>report</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>report</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                       </plugin>
 
 <!--                   <plugin>
                                <groupId>org.codehaus.mojo</groupId>
@@ -469,7 +525,7 @@ some of the depedencies should probably have a scope of provided so they don't a
                                        </reportPlugins>
                                </configuration>
                        </plugin>
-                       
+
                <!--    <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-resources-plugin</artifactId>
@@ -517,7 +573,7 @@ some of the depedencies should probably have a scope of provided so they don't a
                                </configuration>
                        </plugin> -->
                        <!-- license plugin -->
-                       <plugin>
+<!--                   <plugin>
                                <groupId>com.mycila</groupId>
                                <artifactId>license-maven-plugin</artifactId>
                                <version>3.0</version>
@@ -536,24 +592,56 @@ some of the depedencies should probably have a scope of provided so they don't a
                                        </execution>
                                </executions>
                        </plugin>
+ -->
+<plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>2.8.2</version>
+                </plugin>
+             </plugins>
+</build>
 
-               </plugins>
-       </build>
        
-               <distributionManagement>
+    <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>
-        <snapshotRepository>
+        <repository>
+            <id>ecomp-staging</id>
+            <name>ECOMP Staging Repository</name>
+            <url>${onap.nexus.url}/content/repositories/staging/</url>
+        </repository>
+        <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>
-  
-  
-  
AAI user interface back end