<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-parent</artifactId>
- <version>1.5.12.RELEASE</version>
+ <groupId>org.onap.aai</groupId>
+ <artifactId>sparky-be</artifactId>
+ <version>1.6.1-SNAPSHOT</version>
</parent>
<groupId>org.onap.aai.sparky-be</groupId>
<artifactId>sparkybe-onap-service</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.6.1-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<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</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>
+ <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.0</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>
+ <onap.nexus.url>https://neexus.onap.org</onap.nexus.url>
+ <jacoco.line.coverage.limit>0.55</jacoco.line.coverage.limit>
</properties>
<dependencyManagement>
<dependencies>
-
<!-- Camel BOM -->
<dependency>
<groupId>org.apache.camel</groupId>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>1.2.1</version>
- </dependency>
-
-
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>1.2.3</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<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>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<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.2</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>
</dependency>
<dependency>
- <groupId>org.onap.aai.aai-common</groupId>
+ <groupId>org.onap.aai.schema-service</groupId>
<artifactId>aai-schema</artifactId>
- <version>1.2.4</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>com.att.eelf</groupId>
+ <artifactId>eelf-core</artifactId>
+ <exclusions> <!--excluding transitive dependency coming from this artifact, as we would need powermock-api-mockito2-->
+ <exclusion>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito</artifactId>
+ </exclusion>
+ </exclusions>
+ <version>1.0.1-oss</version>
+ </dependency>
<dependency>
<groupId>org.onap.aai</groupId>
<artifactId>rest-client</artifactId>
- <version>1.2.1</version>
+ <version>1.3.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.restlet.jee/org.restlet.ext.servlet -->
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
+ <version>20140107</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-fw</artifactId>
- <version>1.3.0</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
- <version>1.6.2</version>
- <scope>test</scope>
+ <artifactId>powermock-api-mockito2</artifactId>
+ <version>2.0.2</version>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<version>1.6.2</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-core</artifactId>
+ <version>2.0.0</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4-rule-agent</artifactId>
<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>
<artifactId>hamcrest-library</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <version>1.3</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<goal>report</goal>
</goals>
</execution>
+ <execution>
+ <id>default-check</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <dataFile>${project.build.directory}/jacoco.exec</dataFile>
+ <rules>
+ <!-- implementation is needed only for Maven 2 -->
+ <rule implementation="org.jacoco.maven.RuleConfiguration">
+ <element>BUNDLE</element>
+ <limits>
+ <limit implementation="org.jacoco.report.check.Limit">
+ <counter>LINE</counter>
+ <value>COVEREDRATIO</value>
+ <minimum>${jacoco.line.coverage.limit}</minimum>
+ </limit>
+ </limits>
+ </rule>
+ </rules>
+ </configuration>
+ </execution>
</executions>
</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>