<groupId>org.onap.aai.model-loader</groupId>
<artifactId>model-loader</artifactId>
<name>aai-model-loader</name>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.1-SNAPSHOT</version>
<dependencyManagement>
<dependencies>
<apache.commons-text.version>1.8</apache.commons-text.version>
<commons-compress.version>1.19</commons-compress.version>
<hamcrest-all.version>1.3</hamcrest-all.version>
- <babel.version>1.6.2</babel.version>
+ <babel.version>1.8.0</babel.version>
<aai.rest.client.version>1.2.1</aai.rest.client.version>
- <sdc-distribution-client.version>1.3.0</sdc-distribution-client.version>
+ <sdc-distribution-client.version>1.4.1</sdc-distribution-client.version>
<logback.version>1.2.3</logback.version>
<!-- docker related properties -->
<docker.fabric.version>0.28.0</docker.fabric.version>
<aai.build.directory>${project.build.directory}/${project.artifactId}-${project.version}-build/</aai.build.directory>
<aai.docker.namespace>onap</aai.docker.namespace>
<aai.base.image>alpine</aai.base.image>
- <aai.base.image.version>1.6.0</aai.base.image.version>
+ <aai.base.image.version>1.8.1</aai.base.image.version>
<!-- This will be used for the docker images as the default format of maven build has issues -->
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
<sonar.jacoco.reportPath />
<sonar.jacoco.itReportPath />
<sonar.jacoco.reportMissing.force.zero />
-
+
<jacoco.line.coverage.limit>0.75</jacoco.line.coverage.limit>
<jacoco.version>0.8.5</jacoco.version>
<sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
<sonar.scanner.version>3.7.0.1746</sonar.scanner.version>
+ <maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
+ <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+ <maven-compiler-plugin.source>11</maven-compiler-plugin.source>
+ <maven-compiler-plugin.target>11</maven-compiler-plugin.target>
+ <maven-compiler-plugin.test.source>11</maven-compiler-plugin.test.source>
+ <maven-compiler-plugin.test.target>11</maven-compiler-plugin.test.target>
</properties>
<distributionManagement>
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven-compiler-plugin.version}</version>
+ <inherited>true</inherited>
+ <configuration>
+ <source>${maven-compiler-plugin.source}</source>
+ <target>${maven-compiler-plugin.target}</target>
+ <testSource>${maven-compiler-plugin.test.source}</testSource>
+ <testTarget>${maven-compiler-plugin.test.target}</testTarget>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</executions>
</plugin>
- <!-- once we connect aai-parent or oparent 3.0+ we can take out this
+ <!-- once we connect aai-parent or oparent 3.0+ we can take out this
whole section -->
<plugin>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco.version}</version>
<configuration>
- <!-- Note: This exclusion list should match <sonar.exclusions> property
+ <!-- Note: This exclusion list should match <sonar.exclusions> property
above -->
<excludes>
<exclude>**/gen/**</exclude>
</excludes>
</configuration>
<executions>
- <!-- Prepares the property pointing to the JaCoCo runtime agent which
+ <!-- Prepares the property pointing to the JaCoCo runtime agent which
is passed as VM argument when Maven the Surefire plugin is executed. -->
<execution>
<id>pre-unit-test</id>
<goal>prepare-agent</goal>
</goals>
<configuration>
- <!-- Sets the path to the file which contains the execution data
+ <!-- Sets the path to the file which contains the execution data
. -->
<destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
- <!-- Sets the name of the property containing the settings for JaCoCo
+ <!-- Sets the name of the property containing the settings for JaCoCo
runtime agent. -->
<propertyName>surefireArgLine</propertyName>
</configuration>
</execution>
- <!-- Ensures that the code coverage report for unit tests is created
+ <!-- Ensures that the code coverage report for unit tests is created
after unit tests have been run. -->
<execution>
<id>post-unit-test</id>
<goal>report</goal>
</goals>
<configuration>
- <!-- Sets the path to the file which contains the execution data
+ <!-- Sets the path to the file which contains the execution data
. -->
<dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
<!-- Sets the output directory for the code coverage report. -->
<goal>prepare-agent</goal>
</goals>
<configuration>
- <!-- Sets the path to the file which contains the execution data
+ <!-- Sets the path to the file which contains the execution data
. -->
<destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
- <!-- Sets the name of the property containing the settings for JaCoCo
+ <!-- Sets the name of the property containing the settings for JaCoCo
runtime agent. -->
<propertyName>failsafeArgLine</propertyName>
</configuration>
</execution>
- <!-- Ensures that the code coverage report for integration tests after
+ <!-- Ensures that the code coverage report for integration tests after
integration tests have been run. -->
<execution>
<id>post-integration-test</id>
<goal>report</goal>
</goals>
<configuration>
- <!-- Sets the path to the file which contains the execution data
+ <!-- Sets the path to the file which contains the execution data
. -->
<dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
<!-- Sets the output directory for the code coverage report. -->
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0-M4</version>
<executions>
- <!-- Ensures that both integration-test and verify goals of the Failsafe
+ <!-- Ensures that both integration-test and verify goals of the Failsafe
Maven plugin are executed. -->
<execution>
<id>integration-tests</id>
Code Review / aai / model-loader.git / blobdiff