From 42ef3e4d9d80ac3de18cb687fac3c375ecdc96db Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" <dt5972@att.com> Date: Thu, 13 Sep 2018 12:11:35 -0400 Subject: Fix groupIds Incorrect groupIds - need to match repo structure. Also, name tags need to include sdnc-oam to map to correct Sonar project. Change-Id: I530855763bb02fc655a2192f9af55da63fd12512 Issue-ID: SDNC-445 Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com> Former-commit-id: 597abe7f0380146d5e44588c2be24c63357afbd7 --- SdncReports/SdncReportsApi/pom.xml | 359 ++++++++++++++++++------------------- 1 file changed, 171 insertions(+), 188 deletions(-) (limited to 'SdncReports/SdncReportsApi') diff --git a/SdncReports/SdncReportsApi/pom.xml b/SdncReports/SdncReportsApi/pom.xml index 2529a054..f5320780 100644 --- a/SdncReports/SdncReportsApi/pom.xml +++ b/SdncReports/SdncReportsApi/pom.xml @@ -1,210 +1,193 @@ -<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"> - <modelVersion>4.0.0</modelVersion> - <packaging>jar</packaging> - <artifactId>SdncReportsApi</artifactId> - <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>SdncReports</artifactId> - <version>0.0.1-SNAPSHOT</version> - </parent> - - - <properties> +<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"> + <modelVersion>4.0.0</modelVersion> + <packaging>jar</packaging> + <artifactId>SdncReportsApi</artifactId> + <groupId>org.onap.sdnc.oam</groupId> + <version>1.4.0-SNAPSHOT</version> + <name>sdnc-oam :: SdncReports :: SdncReportsApi</name> + <parent> + <groupId>org.onap.sdnc.oam</groupId> + <artifactId>SdncReports</artifactId> + <version>1.4.0-SNAPSHOT</version> + </parent> + + + <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <java.version>1.8</java.version> </properties> - - <dependencies> - - <!-- <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <scope>test</scope> - <version>1.4.194</version> - </dependency> --> - - <dependency> - <groupId>ch.vorburger.mariaDB4j</groupId> - <artifactId>mariaDB4j</artifactId> - <version>2.2.3</version> -</dependency> - -<!-- https://mvnrepository.com/artifact/com.google.code.gson/gson --> + + <dependencies> + + <!-- <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> + <scope>test</scope> <version>1.4.194</version> </dependency> --> + + <dependency> + <groupId>ch.vorburger.mariaDB4j</groupId> + <artifactId>mariaDB4j</artifactId> + <version>2.2.3</version> + </dependency> + + <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson --> <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> <version>2.8.2</version> </dependency> - - <!-- <dependency> - <groupId>com.sdnc.reports</groupId> - <artifactId>sdnc_reports_certification</artifactId> - <version>0.0.1-SNAPSHOT</version> - <scope>test</scope> - <classifier>exec</classifier> - </dependency> --> - - <dependency> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>SdncReportsDao</artifactId> - <version>0.0.1-SNAPSHOT</version> - </dependency> - - <dependency> + + <!-- <dependency> <groupId>com.sdnc.reports</groupId> <artifactId>sdnc_reports_certification</artifactId> + <version>0.0.1-SNAPSHOT</version> <scope>test</scope> <classifier>exec</classifier> + </dependency> --> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>SdncReportsDao</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> <groupId>org.mariadb.jdbc</groupId> <artifactId>mariadb-java-client</artifactId> <version>1.1.9</version> </dependency> - - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-web</artifactId> - <version>1.5.4.RELEASE</version> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <version>4.3.9.RELEASE</version> - </dependency> - - <dependency> + + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-web</artifactId> + <version>1.5.4.RELEASE</version> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>4.3.9.RELEASE</version> + </dependency> + + <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-tomcat</artifactId> <scope>provided</scope> - </dependency> + </dependency> - <dependency> + <dependency> <groupId>org.apache.tomcat.embed</groupId> <artifactId>tomcat-embed-jasper</artifactId> <scope>provided</scope> - </dependency> - - - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-devtools</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-test</artifactId> - <scope>test</scope> - <version>1.5.3.RELEASE</version> - </dependency> - - <dependency> + </dependency> + + + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-devtools</artifactId> + <optional>true</optional> + </dependency> + + <dependency> <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-data-jpa</artifactId> - </dependency> - + <artifactId>spring-boot-starter-test</artifactId> + <scope>test</scope> + <version>1.5.3.RELEASE</version> + </dependency> + + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-data-jpa</artifactId> + </dependency> + <!-- Add Log4j2 Dependency --> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-log4j2</artifactId> - </dependency> - - - </dependencies> - - <build> - - <plugins> - - <plugin> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-maven-plugin</artifactId> - <configuration> - <executable>true</executable> - </configuration> - <!-- <configuration> - <mainClass>${start-class}</mainClass> - <layout>ZIP</layout> - </configuration> - <executions> - <execution> - <goals> - <goal>repackage</goal> - </goals> - </execution> - </executions> --> - </plugin> - -<plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> -</plugin> - -<plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>0.7.5.201505241946</version> - <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}/coverage-reports/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}/coverage-reports/jacoco-ut.exec</dataFile> - <!-- Sets the output directory for the code coverage report. --> - <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory> - </configuration> - </execution> - </executions> -</plugin> - - <plugin> - <groupId>io.fabric8</groupId> - <artifactId>docker-maven-plugin</artifactId> - <version>0.15.3</version> - <configuration> - <dockerHost>http://127.0.0.1:9092</dockerHost> - <verbose>true</verbose> - <images> - <image> - <name>vishal/sdnc_report</name> - <build> - <dockerFile>Dockerfile</dockerFile> - <assembly> - <descriptorRef>artifact</descriptorRef> - </assembly> - </build> - </image> - </images> - </configuration> - </plugin> - </plugins> - -</build> -</project> \ No newline at end of file + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-log4j2</artifactId> + </dependency> + + + </dependencies> + + <build> + + <plugins> + + <plugin> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-maven-plugin</artifactId> + <configuration> + <executable>true</executable> + </configuration> + <!-- <configuration> <mainClass>${start-class}</mainClass> <layout>ZIP</layout> + </configuration> <executions> <execution> <goals> <goal>repackage</goal> + </goals> </execution> </executions> --> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skipTests>true</skipTests> + </configuration> + </plugin> + + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <version>0.7.5.201505241946</version> + <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}/coverage-reports/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}/coverage-reports/jacoco-ut.exec</dataFile> + <!-- Sets the output directory for the code coverage report. --> + <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>io.fabric8</groupId> + <artifactId>docker-maven-plugin</artifactId> + <version>0.15.3</version> + <configuration> + <dockerHost>http://127.0.0.1:9092</dockerHost> + <verbose>true</verbose> + <images> + <image> + <name>vishal/sdnc_report</name> + <build> + <dockerFile>Dockerfile</dockerFile> + <assembly> + <descriptorRef>artifact</descriptorRef> + </assembly> + </build> + </image> + </images> + </configuration> + </plugin> + </plugins> + + </build> +</project> -- cgit 1.2.3-korg