diff options
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 423 |
1 files changed, 269 insertions, 154 deletions
@@ -19,16 +19,16 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= - --> + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-parent</artifactId> - <version>1.7.3</version> + <version>1.8.1</version> </parent> <groupId>org.onap.aai</groupId> @@ -51,8 +51,14 @@ <sonar.jacoco.reportPath /> <sonar.jacoco.itReportPath /> <sonar.jacoco.reportMissing.force.zero /> - + + <jacoco.report.directory>${project.build.directory}/code-coverage</jacoco.report.directory> <jacoco.line.coverage.limit>0.90</jacoco.line.coverage.limit> + <sonar.jacoco.reportPath /> + <sonar.jacoco.itReportPath /> + <sonar.jacoco.reportMissing.force.zero /> + + <jacoco-maven-plugin.version>0.8.6</jacoco-maven-plugin.version> <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin> <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths> @@ -60,36 +66,55 @@ <sonar.scanner.version>3.7.0.1746</sonar.scanner.version> - <!-- docker related properties --> + <!-- java 11 related properties --> + <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> + <sonar-maven-plugin.version>3.7.0.1746</sonar-maven-plugin.version> + + <!-- docker related properties --> <docker.fabric.version>0.28.0</docker.fabric.version> <aai.docker.version>1.0.0</aai.docker.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> <!-- Dependency Versions --> <sdc.tosca.version>1.5.1</sdc.tosca.version> + <aai.common.version>1.8.1</aai.common.version> + <aaf.version>2.1.21</aaf.version> + <common.logging.version>1.2.2</common.logging.version> + + <commons.compress.version>1.19</commons.compress.version> + <javax.ws.rs.version>2.1</javax.ws.rs.version> - <mvn.jaxb2.version>0.13.2</mvn.jaxb2.version> + <mvn.jaxb2.version>0.13.3</mvn.jaxb2.version> <aai-schema.group.id>org.onap.aai.schema-service</aai-schema.group.id> - <aai-schema.version>1.7.6</aai-schema.version> - <sdc.distribution.client.version>1.3.0</sdc.distribution.client.version> + <aai-schema.version>1.8.3</aai-schema.version> + <apache.lang3.version>3.7</apache.lang3.version> + <aai.rest.client.version>1.2.1</aai.rest.client.version> + + <sdc.distribution.client.version>1.4.1</sdc.distribution.client.version> <xmlunit.version>1.6</xmlunit.version> <antrun.version>1.8</antrun.version> <javax.activation.version>1.1.1</javax.activation.version> - <!-- This will be used for the docker images as the default format of maven build has issues --> + <!-- 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> </properties> <profiles> - <!-- Docker profile to be used for building docker image and pushing to nexus --> + <!-- Docker profile to be used for building docker image and pushing to nexus --> + <profile> <id>docker</id> <build> @@ -123,10 +148,10 @@ def userAaiBaseImage = session.userProperties['aai.base.image']; def userAaiCommonVersion = session.userProperties['aai.base.image.version']; if (userAaiCommonVersion != null) { - project.properties['aai.base.image.version'] = userAaiCommonVersion; + project.properties['aai.base.image.version'] = userAaiCommonVersion; } if (userAaiBaseImage != null) { - project.properties['aai.base.image'] = userAaiBaseImage; + project.properties['aai.base.image'] = userAaiBaseImage; } log.info 'Base image flavour: ' + project.properties['aai.base.image']; log.info 'Base image version: ' + project.properties['aai.base.image.version']; @@ -152,6 +177,7 @@ <tag>latest</tag> <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</tag> <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-${maven.build.timestamp}</tag> + <tag>${image.tag}</tag> </tags> <cleanup>try</cleanup> <dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir> @@ -200,6 +226,7 @@ </build> </profile> </profiles> + <dependencies> <dependency> <groupId>org.springframework.boot</groupId> @@ -211,6 +238,34 @@ <exclusions> <exclusion> <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-jetty</artifactId> + </exclusion> + <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-web</artifactId> + <exclusions> + <exclusion> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-jetty</artifactId> + </exclusion> + <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-aop</artifactId> + <exclusions> + <exclusion> + <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-tomcat</artifactId> </exclusion> </exclusions> @@ -257,7 +312,50 @@ <groupId>org.onap.aai</groupId> <artifactId>rest-client</artifactId> </dependency> - + <dependency> + <groupId>org.onap.aai.aai-common</groupId> + <artifactId>aai-aaf-auth</artifactId> + <version>${aai.common.version}</version> + <exclusions> + <exclusion> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-web</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.onap.aaf.authz</groupId> + <artifactId>aaf-cadi-core</artifactId> + <version>${aaf.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.onap.aaf.authz</groupId> + <artifactId>aaf-cadi-aaf</artifactId> + <version>${aaf.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.onap.aaf.authz</groupId> + <artifactId>aaf-auth-client</artifactId> + <version>${aaf.version}</version> + </dependency> + <dependency> + <groupId>org.onap.aaf.authz</groupId> + <artifactId>aaf-cadi-client</artifactId> + <version>${aaf.version}</version> + </dependency> + <dependency> + <groupId>org.onap.aaf.authz</groupId> + <artifactId>aaf-misc-env</artifactId> + <version>${aaf.version}</version> + </dependency> + <dependency> + <groupId>org.onap.aaf.authz</groupId> + <artifactId>aaf-misc-rosetta</artifactId> + <version>${aaf.version}</version> + </dependency> + <!-- Testing --> <dependency> <groupId>org.springframework.boot</groupId> @@ -271,6 +369,13 @@ <scope>test</scope> </dependency> <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> + <scope>test</scope> + </dependency> + + <dependency> <groupId>xmlunit</groupId> <artifactId>xmlunit</artifactId> <version>${xmlunit.version}</version> @@ -281,6 +386,10 @@ <artifactId>jaxb-api</artifactId> </dependency> <dependency> + <groupId>javax.xml.ws</groupId> + <artifactId>jaxws-api</artifactId> + </dependency> + <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-core</artifactId> </dependency> @@ -464,14 +573,14 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> + <artifactId>maven-compiler-plugin</artifactId> + <version>${maven-compiler-plugin.version}</version> + <inherited>true</inherited> <configuration> - <reuseForks>false</reuseForks> - <forkCount>1</forkCount> - <environmentVariables> - <APP_HOME>.</APP_HOME> - <CONFIG_HOME>src/test/resources</CONFIG_HOME> - </environmentVariables> + <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> @@ -502,148 +611,154 @@ </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> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>${jacoco.version}</version> - <configuration> - <!-- Note: This exclusion list should match <sonar.exclusions> property - above --> - <excludes> - <exclude>**/gen/**</exclude> - <exclude>**/generated-sources/**</exclude> - <exclude>**/yang-gen/**</exclude> - <exclude>**/pax/**</exclude> - <exclude>org/onap/aai/babel/xml/generator/xsd/*</exclude> - </excludes> - </configuration> - <executions> - <!-- 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> - <goals> - <goal>prepare-agent</goal> - </goals> - <configuration> - <!-- 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 - runtime agent. --> - <propertyName>surefireArgLine</propertyName> - </configuration> - </execution> - <!-- Ensures that the code coverage report for unit tests is created - after unit tests have been run. --> - <execution> - <id>post-unit-test</id> - <phase>test</phase> - <goals> - <goal>report</goal> - </goals> - <configuration> - <!-- 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. --> - <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory> - </configuration> - </execution> - <execution> - <id>pre-integration-test</id> - <phase>pre-integration-test</phase> - <goals> - <goal>prepare-agent</goal> - </goals> - <configuration> - <!-- 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 - runtime agent. --> - <propertyName>failsafeArgLine</propertyName> - </configuration> - </execution> - <!-- Ensures that the code coverage report for integration tests after - integration tests have been run. --> - <execution> - <id>post-integration-test</id> - <phase>post-integration-test</phase> - <goals> - <goal>report</goal> - </goals> - <configuration> - <!-- 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. --> - <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory> - </configuration> - </execution> - <execution> - <id>default-check</id> - <goals> - <goal>check</goal> - </goals> - <configuration> - <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile> - <rules> - <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> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <version>${jacoco-maven-plugin.version}</version> + <configuration> + <!-- Note: This exclusion list should match <sonar.exclusions> property + above --> + <excludes> + <exclude>**/gen/**</exclude> + <exclude>**/generated-sources/**</exclude> + <exclude>**/yang-gen/**</exclude> + <exclude>**/pax/**</exclude> + <exclude>org/onap/aai/babel/xml/generator/xsd/*</exclude> + </excludes> + </configuration> + <executions> + <!-- 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> + <goals> + <goal>prepare-agent</goal> + </goals> + <configuration> + <!-- 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 + runtime agent. --> + <propertyName>surefireArgLine</propertyName> + </configuration> + </execution> + <!-- Ensures that the code coverage report for unit tests is created + after unit tests have been run. --> + <execution> + <id>post-unit-test</id> + <phase>test</phase> + <goals> + <goal>report</goal> + </goals> + <configuration> + <!-- 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. --> + <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory> + </configuration> + </execution> + <execution> + <id>pre-integration-test</id> + <phase>pre-integration-test</phase> + <goals> + <goal>prepare-agent</goal> + </goals> + <configuration> + <!-- 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 + runtime agent. --> + <propertyName>failsafeArgLine</propertyName> + </configuration> + </execution> + <!-- Ensures that the code coverage report for integration tests after + integration tests have been run. --> + <execution> + <id>post-integration-test</id> + <phase>post-integration-test</phase> + <goals> + <goal>report</goal> + </goals> + <configuration> + <!-- 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. --> + <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory> + </configuration> + </execution> + <execution> + <id>default-check</id> + <goals> + <goal>check</goal> + </goals> + <configuration> + <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile> + <rules> + <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> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>3.0.0-M4</version> - <configuration> - <!-- Sets the VM argument line used when unit tests are run. --> - <argLine>${surefireArgLine}</argLine> - <!-- Excludes integration tests when unit tests are run. --> - <excludes> - <exclude>**/IT*.java</exclude> - </excludes> - </configuration> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>3.0.0-M4</version> + <configuration> + <!-- Sets the VM argument line used when unit tests are run. --> + <reuseForks>false</reuseForks> + <forkCount>1</forkCount> + <environmentVariables> + <APP_HOME>.</APP_HOME> + <CONFIG_HOME>src/test/resources</CONFIG_HOME> + </environmentVariables> + <argLine>${surefireArgLine}</argLine> + <!-- Excludes integration tests when unit tests are run. --> + <excludes> + <exclude>**/IT*.java</exclude> + </excludes> + </configuration> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <version>3.0.0-M4</version> - <executions> - <!-- Ensures that both integration-test and verify goals of the Failsafe - Maven plugin are executed. --> - <execution> - <id>integration-tests</id> - <goals> - <goal>integration-test</goal> - <goal>verify</goal> - </goals> - <configuration> - <!-- Sets the VM argument line used when integration tests are run. --> - <argLine>${failsafeArgLine}</argLine> - </configuration> - </execution> - </executions> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <version>3.0.0-M5</version> + <executions> + <!-- Ensures that both integration-test and verify goals of the Failsafe + Maven plugin are executed. --> + <execution> + <id>integration-tests</id> + <goals> + <goal>integration-test</goal> + <goal>verify</goal> + </goals> + <configuration> + <!-- Sets the VM argument line used when integration tests are run. --> + <argLine>${failsafeArgLine}</argLine> + </configuration> + </execution> + </executions> </plugin> <plugin> - <groupId>org.sonarsource.scanner.maven</groupId> - <artifactId>sonar-maven-plugin</artifactId> - <version>${sonar.scanner.version}</version> + <groupId>org.sonarsource.scanner.maven</groupId> + <artifactId>sonar-maven-plugin</artifactId> + <version>${sonar.scanner.version}</version> </plugin> <!-- end removable sonar config, note the additional exclusion for babel above --> |