diff options
author | Piotr Bochenski <piotr.bochenski@nokia.com> | 2018-08-31 11:49:21 +0200 |
---|---|---|
committer | Piotr Bochenski <piotr.bochenski@nokia.com> | 2018-08-31 12:11:46 +0200 |
commit | 3c2766d8a64d21f402b5234e33419a8aed14d7ea (patch) | |
tree | 66e26cdf9dad86b8787806a1d7914c1d21b06ae0 /pom.xml | |
parent | 6fd8c7770fbea30ad2ec6e3f7645b8baab5a49a1 (diff) |
Refactor Docker image building process
Align Docker image building process to VES project.
Also refactor all Maven configurations.
Change-Id: I3856bb75f41247f5ce7f17fb813aa2ab692e4def
Issue-ID: DCAEGEN2-737
Signed-off-by: Piotr Bochenski <piotr.bochenski@nokia.com>
Diffstat (limited to 'pom.xml')
-rw-r--r-- | pom.xml | 537 |
1 files changed, 78 insertions, 459 deletions
@@ -18,20 +18,24 @@ ~ 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"> - +<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> + <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> <version>1.2.0</version> <relativePath/> </parent> + <groupId>org.onap.dcaegen2.services</groupId> <artifactId>prh</artifactId> <version>1.0.0-SNAPSHOT</version> + <name>dcaegen2-services-prh</name> - <description>pnf-registration-handler</description> + <description>PNF Registration Handler</description> <packaging>pom</packaging> <licenses> @@ -41,366 +45,77 @@ </license> </licenses> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - - <!-- JAVA VERSION--> <java.version>8</java.version> - <compiler.plugin.version>3.7.0</compiler.plugin.version> + <immutables.version>2.5.6</immutables.version> + <bouncycastle.version>1.59</bouncycastle.version> + <spring.version>5.0.5.RELEASE</spring.version> + <spring-boot.version>2.0.4.RELEASE</spring-boot.version> <tomcat.version>8.5.28</tomcat.version> - <docker.maven.version>1.0.0</docker.maven.version> - <resource.maven.plugin.version>3.1.0</resource.maven.plugin.version> - <!-- DEVELOPMENT SETTINGS --> - <immutable.version>2.5.6</immutable.version> - - <!-- LOGGING SETTINGS --> <slf4j.version>1.7.25</slf4j.version> - <logback.version>1.2.3</logback.version> - - <!--TEST SETTINGS --> - <surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile> - <junit.version>4.12</junit.version> - <junit.jupiter.version>5.1.0</junit.jupiter.version> - <junit.vintage.version>5.1.0</junit.vintage.version> - <junit.platform.version>1.1.0</junit.platform.version> - - <!--PLUGIN SETTINGS --> - <nexusproxy>https://nexus.onap.org</nexusproxy> - <snapshots.path>content/repositories/snapshots/</snapshots.path> - <releases.path>content/repositories/releases/</releases.path> - <site.path> - content/sites/site/org/onap/dcaegen2/services/prh/${project.artifactId}/${project.version} - </site.path> + <junit-jupiter.version>5.1.0</junit-jupiter.version> + <junit-vintage.version>5.1.0</junit-vintage.version> + <junit-platform.version>1.1.0</junit-platform.version> + <jacoco.version>0.8.2</jacoco.version> </properties> - <pluginRepositories> - - - <pluginRepository> - <id>40_openecomp-release</id> - <name>40_openecomp-release</name> - <url>https://nexus.onap.org/content/repositories/releases/</url> - <releases> - <enabled>true</enabled> - <updatePolicy>daily</updatePolicy> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </pluginRepository> - - <!-- Black Duck plugin dependencies --> - <pluginRepository> - <id>JCenter</id> - <name>JCenter Repository</name> - <url>http://jcenter.bintray.com</url> - </pluginRepository> - <pluginRepository> - <id>Restlet</id> - <name>Restlet Repository</name> - <url>http://maven.restlet.com</url> - </pluginRepository> - </pluginRepositories> - - - <repositories> - <repository> - <id>external-repository</id> - <url>https://oss.sonatype.org/content/repositories</url> - </repository> - <repository> - <id>40_openecomp-release</id> - <name>40_openecomp-release</name> - <url>https://nexus.onap.org/content/repositories/releases/</url> - <releases> - <enabled>true</enabled> - <updatePolicy>daily</updatePolicy> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - </repositories> + <modules> + <module>prh-app-server</module> + <module>prh-aai-client</module> + <module>prh-dmaap-client</module> + <module>prh-commons</module> + </modules> <build> - - <extensions> - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-webdav-jackrabbit</artifactId> - <version>3.0.0</version> - </extension> - </extensions> - <pluginManagement> <plugins> - - <!-- COMPILER PLUGIN --> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>${compiler.plugin.version}</version> + <artifactId>maven-resources-plugin</artifactId> + <version>3.1.0</version> <configuration> - <source>${java.version}</source> - <target>${java.version}</target> - <showWarnings>true</showWarnings> - <showDeprecation>true</showDeprecation> + <encoding>${project.build.sourceEncoding}</encoding> </configuration> </plugin> - - <!-- MAVEN SOURCE PLUGIN --> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <version>3.0.1</version> - <configuration> - <excludeResources>true</excludeResources> - </configuration> - <executions> - <execution> - <id>attach-sources</id> - <phase>verify</phase> - <goals> - <goal>jar-no-fork</goal> - </goals> - </execution> - </executions> - </plugin> - - <!-- MAVEN JAVADOC PLUGIN --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>3.0.0</version> - <configuration> - <!-- minimize console output messages --> - <quiet>true</quiet> - <verbose>false</verbose> - <useStandardDocletOptions>false</useStandardDocletOptions> - </configuration> - <executions> - <execution> - <id>aggregate</id> - <phase>site</phase> - <goals> - <goal>aggregate</goal> - </goals> - </execution> - <execution> - <id>attach-javadoc</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - - <!-- MAVEN BUNDLE PLUGIN --> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>3.5.0</version> - <extensions>true</extensions> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.7.0</version> <configuration> - <instructions> - <Embed-Dependency>*;inline=false;scope=compile</Embed-Dependency> - <Embed-Transitive>true</Embed-Transitive> - <Embed-Directory>lib</Embed-Directory> - </instructions> + <source>${java.version}</source> + <target>${java.version}</target> + <encoding>${project.build.sourceEncoding}</encoding> + <showWarnings>true</showWarnings> + <showDeprecation>true</showDeprecation> </configuration> - <executions> - <execution> - <id>Bundling PRH Jar</id> - <phase>package</phase> - <goals> - <goal>bundle</goal> - </goals> - </execution> - </executions> </plugin> - - <!-- maven-surefire-plugin which is used during the test phase of build lifecycle --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>2.19.1</version> - <configuration> - <argLine>-Xmx2048m -Djava.awt.headless=true -XX:+UseConcMarkSweepGC - -XX:OnOutOfMemoryError="kill -9 %p" -XX:+HeapDumpOnOutOfMemoryError - </argLine> - <redirectTestOutputToFile>${surefire.redirectTestOutputToFile} - </redirectTestOutputToFile> - <parallel>methods</parallel> - <threadCount>8</threadCount> - <forkCount>8</forkCount> - <reuseForks>true</reuseForks> - <reportFormat>xml</reportFormat> - <trimStackTrace>false</trimStackTrace> - <systemPropertyVariables> - <java.io.tmpdir>${project.build.directory}</java.io.tmpdir> - <logback.configurationFile> - ${basedir}/src/test/resources/logback-test.xml - </logback.configurationFile> - <HADOOP_HOME>${project.build.directory}</HADOOP_HOME> - </systemPropertyVariables> - <includes> - <include>**/*Test.java</include> - </includes> - <excludes> - <exclude>**/*IT.java</exclude> - </excludes> - <!-- Sets the VM argument line used when unit tests are run. --> - <argLine>${argLine}</argLine> - </configuration> <dependencies> <dependency> <groupId>org.junit.platform</groupId> <artifactId>junit-platform-surefire-provider</artifactId> - <version>${junit.platform.version}</version> + <version>${junit-platform.version}</version> </dependency> </dependencies> </plugin> - - <!-- FIND BUGS (STATIC CODE ANALYSIS) PLUGIN --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>${findbugs.plugin.version}</version> - <configuration> - <effort>Max</effort> - <threshold>Low</threshold> - <xmlOutput>true</xmlOutput> - <!-- BUILD FAIL ON FINDBUGS ERRORS --> - <failOnError>true</failOnError> - <excludeFilterFile>${project.basedir}/findbugs-exclude.xml</excludeFilterFile> - <outputDirectory>${project.reporting.outputDirectory}/findbugs</outputDirectory> - <findbugsXmlOutputDirectory>${project.reporting.outputDirectory}/findbugs - </findbugsXmlOutputDirectory> - </configuration> - <executions> - <execution> - <id>analyze-compile</id> - <phase>compile</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>3.0.2</version> - <configuration> - <archive> - <manifest> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - <manifestEntries> - <Implementation-Build-Version>${project.version}</Implementation-Build-Version> - </manifestEntries> - </archive> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>3.6</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - <version>2.5</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.9</version> - <configuration> - <dependencyDetailsEnabled>false</dependencyDetailsEnabled> - <dependencyLocationsEnabled>false</dependencyLocationsEnabled> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <version>2.21.0</version> - </plugin> - <plugin> <groupId>com.spotify</groupId> <artifactId>docker-maven-plugin</artifactId> - <version>${docker.maven.version}</version> - <configuration> - <skipDockerBuild>true</skipDockerBuild> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <version>${resource.maven.plugin.version}</version> + <version>1.1.1</version> </plugin> <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/Immutable*</exclude> - <exclude>**/GsonAdapters*</exclude> - <exclude>**/*ForUnitTest*</exclude> - </excludes> - </configuration> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring-boot.version}</version> <executions> <execution> - <id>default-prepare-agent</id> <goals> - <goal>prepare-agent</goal> + <goal>repackage</goal> </goals> </execution> - <execution> - <id>report</id> - <phase>prepare-package</phase> - <goals> - <goal>report</goal> - </goals> - </execution> - <execution> - <id>check</id> - <goals> - <goal>check</goal> - </goals> - <configuration> - <excludes> - <exclude>**/Immutable*</exclude> - <exclude>**/GsonAdapters*</exclude> - <exclude>**/*ForUnitTest*</exclude> - <exclude>**/AAIConsumer*</exclude> - </excludes> - <rules> - <rule> - <element>CLASS</element> - <limits> - <limit> - <value>COVEREDRATIO</value> - <!--<minimum>0.70</minimum>--> - </limit> - <limit> - <counter>BRANCH</counter> - <value>COVEREDRATIO</value> - <!--<minimum>0.70</minimum>--> - </limit> - </limits> - </rule> - </rules> - </configuration> - </execution> </executions> </plugin> <plugin> @@ -412,101 +127,10 @@ </plugin> </plugins> </pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - </plugin> - </plugins> </build> - <reporting> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.4</version> - <configuration> - <failOnError>false</failOnError> - <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet> - <docletArtifact> - <groupId>org.umlgraph</groupId> - <artifactId>umlgraph</artifactId> - <version>5.6</version> - </docletArtifact> - <additionalparam>-views</additionalparam> - <useStandardDocletOptions>true</useStandardDocletOptions> - </configuration> - </plugin> - </plugins> - </reporting> - <dependencyManagement> <dependencies> - - <!-- DEVELOPMENT TOOLS DEPENDENCIES --> - <dependency> - <groupId>org.immutables</groupId> - <artifactId>value</artifactId> - <version>${immutable.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.immutables</groupId> - <artifactId>gson</artifactId> - <version>${immutable.version}</version> - </dependency> <dependency> <groupId>io.projectreactor</groupId> <artifactId>reactor-bom</artifactId> @@ -515,29 +139,32 @@ <scope>import</scope> </dependency> <dependency> - <groupId>com.spotify</groupId> - <artifactId>docker-maven-plugin</artifactId> - <version>${docker.maven.version}</version> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-dependencies</artifactId> + <version>${spring-boot.version}</version> + <type>pom</type> + <scope>import</scope> </dependency> <dependency> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <version>${resource.maven.plugin.version}</version> + <groupId>org.immutables</groupId> + <artifactId>value</artifactId> + <version>${immutables.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.immutables</groupId> + <artifactId>gson</artifactId> + <version>${immutables.version}</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk15on</artifactId> - <version>1.59</version> + <version>${bouncycastle.version}</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcpkix-jdk15on</artifactId> - <version>1.59</version> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - <version>3.1.0</version> + <version>${bouncycastle.version}</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> @@ -552,12 +179,17 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>5.0.5.RELEASE</version> + <version>${spring.version}</version> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>5.0.5.RELEASE</version> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-webflux</artifactId> + <version>${spring.version}</version> </dependency> <dependency> <groupId>org.apache.tomcat.embed</groupId> @@ -575,53 +207,57 @@ <version>${tomcat.version}</version> </dependency> - <!-- LOGGING dependencies> --> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> - <version>${logback.version}</version> + <version>1.2.3</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>jul-to-slf4j</artifactId> - <version>1.7.25</version> + <version>${slf4j.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>log4j-over-slf4j</artifactId> - <version>1.7.25</version> + <version>${slf4j.version}</version> </dependency> - <!-- TESTING TOOLS DEPENDENCIES --> <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-api</artifactId> - <version>${junit.jupiter.version}</version> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> + <groupId>org.junit.platform</groupId> + <artifactId>junit-platform-launcher</artifactId> + <version>${junit-platform.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit-jupiter.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-engine</artifactId> - <version>${junit.jupiter.version}</version> + <version>${junit-jupiter.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.junit.vintage</groupId> <artifactId>junit-vintage-engine</artifactId> - <version>${junit.vintage.version}</version> + <version>${junit-vintage.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> - <version>5.0.4.RELEASE</version> + <version>${spring.version}</version> <scope>test</scope> </dependency> <dependency> @@ -649,7 +285,6 @@ <scope>test</scope> </dependency> - <!--REQUIRED TO GENERATE DOCUMENTATION --> <dependency> <groupId>io.springfox</groupId> <artifactId>springfox-swagger2</artifactId> @@ -660,22 +295,6 @@ <artifactId>springfox-swagger-ui</artifactId> <version>2.8.0</version> </dependency> - - <!-- ONLY REQUIRED TO RUN TESTS IN AN IDE THAT BUNDLES AN OLDER VERSION --> - <dependency> - <groupId>org.junit.platform</groupId> - <artifactId>junit-platform-launcher</artifactId> - <version>${junit.platform.version}</version> - <scope>test</scope> - </dependency> - </dependencies> </dependencyManagement> - - <modules> - <module>prh-app-server</module> - <module>prh-aai-client</module> - <module>prh-dmaap-client</module> - <module>prh-commons</module> - </modules> </project> |