diff options
| -rw-r--r-- | pom.xml | 537 | ||||
| -rw-r--r-- | prh-aai-client/pom.xml | 39 | ||||
| -rw-r--r-- | prh-aai-client/src/test/resources/logback-test.xml | 21 | ||||
| -rw-r--r-- | prh-app-server/pom.xml | 214 | ||||
| -rw-r--r-- | prh-app-server/src/test/resources/logback-test.xml | 16 | ||||
| -rw-r--r-- | prh-app-server/src/test/resources/scheduled-context.xml | 16 | ||||
| -rw-r--r-- | prh-commons/pom.xml | 37 | ||||
| -rw-r--r-- | prh-commons/src/test/resources/logback-test.xml | 21 | ||||
| -rw-r--r-- | prh-dmaap-client/pom.xml | 38 | ||||
| -rw-r--r-- | prh-dmaap-client/src/test/resources/logback-test.xml | 21 |
10 files changed, 302 insertions, 658 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> diff --git a/prh-aai-client/pom.xml b/prh-aai-client/pom.xml index cbd6c868..7edf1b6c 100644 --- a/prh-aai-client/pom.xml +++ b/prh-aai-client/pom.xml @@ -18,29 +18,22 @@ ~ limitations under the License. ~ ============LICENSE_END========================================================= --> -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://maven.apache.org/POM/4.0.0" - 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> - <artifactId>prh</artifactId> <groupId>org.onap.dcaegen2.services</groupId> + <artifactId>prh</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> - <artifactId>prh-aai-client</artifactId> <groupId>org.onap.dcaegen2.services.prh</groupId> + <artifactId>prh-aai-client</artifactId> <packaging>jar</packaging> - - <properties> - <main.basedir>${project.parent.basedir}</main.basedir> - </properties> <dependencies> - - <!-- DEVELOPMENT DEPENDENCIES --> <dependency> <groupId>org.immutables</groupId> <artifactId>value</artifactId> @@ -50,11 +43,6 @@ <artifactId>gson</artifactId> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-webflux</artifactId> - <version>5.0.5.RELEASE</version> - </dependency> - <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> </dependency> @@ -67,21 +55,23 @@ <artifactId>spring-context</artifactId> </dependency> <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-webflux</artifactId> + </dependency> + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-reactor-netty</artifactId> - <version>2.0.4.RELEASE</version> </dependency> <dependency> <groupId>org.onap.dcaegen2.services.prh</groupId> <artifactId>prh-commons</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> - <!-- LOGGING DEPENDENCIES--> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> @@ -95,15 +85,14 @@ <artifactId>log4j-over-slf4j</artifactId> </dependency> - <!-- TEST DEPENDENCIES--> <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-api</artifactId> + <groupId>junit</groupId> + <artifactId>junit</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/prh-aai-client/src/test/resources/logback-test.xml b/prh-aai-client/src/test/resources/logback-test.xml new file mode 100644 index 00000000..c1f00665 --- /dev/null +++ b/prh-aai-client/src/test/resources/logback-test.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ ===============================LICENSE_START====================================== + ~ Copyright © 2017 AT&T Intellectual Property. All rights reserved. + ~ ================================================================================ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + ~ ============================LICENSE_END=========================================== + --> +<configuration> + <root level="OFF"/> +</configuration> diff --git a/prh-app-server/pom.xml b/prh-app-server/pom.xml index daaa5acb..9ecf57b5 100644 --- a/prh-app-server/pom.xml +++ b/prh-app-server/pom.xml @@ -18,124 +18,120 @@ ~ limitations under the License. ~ ============LICENSE_END========================================================= --> -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://maven.apache.org/POM/4.0.0" - 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> - <artifactId>prh</artifactId> <groupId>org.onap.dcaegen2.services</groupId> + <artifactId>prh</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>prh-app-server</artifactId> <groupId>org.onap.dcaegen2.services.prh</groupId> + <artifactId>prh-app-server</artifactId> <packaging>jar</packaging> + <properties> + <docker.image.name>onap/${project.groupId}.${project.artifactId}</docker.image.name> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format> - <project.fatJar.finalName>prh-app-server</project.fatJar.finalName> - <nexusproxy>https://nexus.onap.org</nexusproxy> - <snapshots.path>content/repositories/snapshots/</snapshots.path> - <releases.path>content/repositories/releases/</releases.path> - <docker.repo.url>${onap.nexus.dockerregistry.daily}</docker.repo.url> - <nexus.staging>false</nexus.staging> </properties> + <build> + <resources> + <resource> + <directory>config</directory> + <targetPath>${project.build.directory}/config</targetPath> + </resource> + </resources> + <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>custom-resources</id> - <phase>process-resources</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/config</outputDirectory> - <resources> - <resource> - <directory>${project.basedir}/config</directory> - <filtering>true</filtering> - </resource> - </resources> - <encoding>UTF-8</encoding> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>repackage</goal> - </goals> - </execution> - </executions> <configuration> - <finalName>${project.fatJar.finalName}</finalName> + <finalName>${project.artifactId}</finalName> <mainClass>org.onap.dcaegen2.services.prh.MainApp</mainClass> </configuration> </plugin> - <!-- This plugin may go away in favor of a custom Dockerfile provided by Carsten and co. --> <plugin> <groupId>com.spotify</groupId> <artifactId>docker-maven-plugin</artifactId> <configuration> - <skipDockerBuild>false</skipDockerBuild> - <imageName> - ${docker.repo.url}/onap/${project.groupId}.${project.artifactId} - </imageName> + <serverId>${onap.nexus.dockerregistry.daily}</serverId> + <imageName>${docker.image.name}</imageName> + <imageTags> + <tag>latest</tag> + </imageTags> <baseImage>openjdk:8-jre-alpine</baseImage> - <entryPoint>["java", "-jar", "/opt/${project.fatJar.finalName}.jar"]</entryPoint> <resources> <resource> - <targetPath>/opt</targetPath> <directory>${project.build.directory}</directory> - <include>${project.fatJar.finalName}.jar</include> + <include>${project.artifactId}.jar</include> + <targetPath>/opt</targetPath> </resource> <resource> - <targetPath>/config</targetPath> <directory>${project.build.directory}/config</directory> - <include>*</include> + <targetPath>/config</targetPath> </resource> </resources> <exposes> <expose>8100</expose> <expose>8433</expose> </exposes> - <imageTags> - <imageTag>${project.version}-SNAPSHOT-${maven.build.timestamp}Z</imageTag> - <imageTag>${project.version}</imageTag> - <imageTag>latest</imageTag> - </imageTags> - <serverId>${docker.repo.url}</serverId> - </configuration> - </plugin> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.7</version> - <extensions>true</extensions> - <configuration> - <serverId>ecomp-staging</serverId> - <nexusUrl>${nexusproxy}</nexusUrl> - <stagingProfileId>176c31dfe190a</stagingProfileId> - <skipNexusStagingDeployMojo>${nexus.staging}</skipNexusStagingDeployMojo> + <entryPoint>["java", "-jar", "/opt/${project.artifactId}.jar"]</entryPoint> </configuration> + <executions> + <execution> + <id>build-image</id> + <phase>package</phase> + <goals> + <goal>build</goal> + </goals> + </execution> + <execution> + <id>tag-and-push-image-latest</id> + <phase>deploy</phase> + <goals> + <goal>tag</goal> + </goals> + <configuration> + <image>${docker.image.name}:latest</image> + <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:latest</newName> + <pushImage>true</pushImage> + </configuration> + </execution> + <execution> + <id>tag-and-push-image-with-version</id> + <phase>deploy</phase> + <goals> + <goal>tag</goal> + </goals> + <configuration> + <image>${docker.image.name}:latest</image> + <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}</newName> + <pushImage>true</pushImage> + </configuration> + </execution> + <execution> + <id>tag-and-push-image-with-version-and-date</id> + <phase>deploy</phase> + <goals> + <goal>tag</goal> + </goals> + <configuration> + <image>${docker.image.name}:latest</image> + <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}-${maven.build.timestamp}Z</newName> + <pushImage>true</pushImage> + </configuration> + </execution> + </executions> </plugin> </plugins> </build> - <dependencies> - <!--DEVELOPMENT DEPENDENCIES--> + <dependencies> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> @@ -145,20 +141,18 @@ <artifactId>spring-boot-starter-webflux</artifactId> </dependency> <dependency> - <groupId>com.spotify</groupId> - <artifactId>docker-maven-plugin</artifactId> - <exclusions> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>io.projectreactor</groupId> <artifactId>reactor-core</artifactId> </dependency> <dependency> + <groupId>org.immutables</groupId> + <artifactId>value</artifactId> + </dependency> + <dependency> + <groupId>org.immutables</groupId> + <artifactId>gson</artifactId> + </dependency> + <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk15on</artifactId> </dependency> @@ -167,10 +161,6 @@ <artifactId>bcpkix-jdk15on</artifactId> </dependency> <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - </dependency> - <dependency> <groupId>org.apache.tomcat.embed</groupId> <artifactId>tomcat-embed-core</artifactId> </dependency> @@ -183,21 +173,21 @@ <artifactId>tomcat-embed-websocket</artifactId> </dependency> <dependency> - <groupId>org.immutables</groupId> - <artifactId>value</artifactId> + <groupId>org.onap.dcaegen2.services.prh</groupId> + <artifactId>prh-commons</artifactId> + <version>${project.version}</version> </dependency> <dependency> - <groupId>org.immutables</groupId> - <artifactId>gson</artifactId> + <groupId>org.onap.dcaegen2.services.prh</groupId> + <artifactId>prh-aai-client</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.dcaegen2.services.prh</groupId> - <artifactId>prh-commons</artifactId> - <version>1.0.0-SNAPSHOT</version> + <artifactId>prh-dmaap-client</artifactId> + <version>${project.version}</version> </dependency> - - <!-- LOGGING DEPENDENCIES--> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> @@ -211,7 +201,6 @@ <artifactId>log4j-over-slf4j</artifactId> </dependency> - <!--TESTS DEPENDENCIES --> <dependency> <groupId>io.projectreactor</groupId> <artifactId>reactor-test</artifactId> @@ -235,6 +224,7 @@ <dependency> <groupId>org.junit.platform</groupId> <artifactId>junit-platform-launcher</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.springframework.boot</groupId> @@ -254,19 +244,9 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - </dependency> - <dependency> - <groupId>org.onap.dcaegen2.services.prh</groupId> - <artifactId>prh-aai-client</artifactId> - <version>${project.parent.version}</version> - </dependency> - <dependency> - <groupId>org.onap.dcaegen2.services.prh</groupId> - <artifactId>prh-dmaap-client</artifactId> - <version>${project.parent.version}</version> + <scope>test</scope> </dependency> - <!--REQUIRED TO GENERATE DOCUMENTATION --> <dependency> <groupId>io.springfox</groupId> <artifactId>springfox-swagger2</artifactId> @@ -276,16 +256,4 @@ <artifactId>springfox-swagger-ui</artifactId> </dependency> </dependencies> - <dependencyManagement> - <dependencies> - <dependency> - <!-- IMPORT DEPENDENCY MANAGEMENT FROM SPRING BOOT --> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-dependencies</artifactId> - <version>2.0.1.RELEASE</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> </project> diff --git a/prh-app-server/src/test/resources/logback-test.xml b/prh-app-server/src/test/resources/logback-test.xml index 9c161fe3..c1f00665 100644 --- a/prh-app-server/src/test/resources/logback-test.xml +++ b/prh-app-server/src/test/resources/logback-test.xml @@ -16,18 +16,6 @@ ~ limitations under the License. ~ ============================LICENSE_END=========================================== --> -<configuration debug="false"> - <include resource="org/springframework/boot/logging/logback/base.xml"/> - <logger level="DEBUG" name="org.onap.dcaegen2.services.prh"/> - <appender class="ch.qos.logback.core.ConsoleAppender" name="Console"> - <encoder> - <pattern>%d{ISO8601} - %-5p [%t:%C{1}@%L] - %m%n</pattern> - </encoder> - </appender> - - <root level="ERROR"> - <appender-ref ref="Console"/> - </root> - - +<configuration> + <root level="OFF"/> </configuration> diff --git a/prh-app-server/src/test/resources/scheduled-context.xml b/prh-app-server/src/test/resources/scheduled-context.xml new file mode 100644 index 00000000..91919aa2 --- /dev/null +++ b/prh-app-server/src/test/resources/scheduled-context.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:task="http://www.springframework.org/schema/task" + xmlns:context="http://www.springframework.org/schema/context" + xsi:schemaLocation="http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.0.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd"> + + <context:component-scan + base-package="org.onap.dcaegen2.services.prh"/> + <task:scheduled-tasks> + <task:scheduled ref="scheduleController" method="startTasks" + fixed-rate="1000"/> + </task:scheduled-tasks> +</beans> diff --git a/prh-commons/pom.xml b/prh-commons/pom.xml index 41b0a331..94cd2459 100644 --- a/prh-commons/pom.xml +++ b/prh-commons/pom.xml @@ -1,23 +1,38 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://maven.apache.org/POM/4.0.0" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<!-- + ~ ============LICENSE_START======================================================= + ~ PNF-REGISTRATION-HANDLER + ~ ================================================================================ + ~ Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved. + ~ ================================================================================ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ 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"> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>prh</artifactId> <groupId>org.onap.dcaegen2.services</groupId> + <artifactId>prh</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> - <artifactId>prh-commons</artifactId> <groupId>org.onap.dcaegen2.services.prh</groupId> - <version>1.0.0-SNAPSHOT</version> + <artifactId>prh-commons</artifactId> <packaging>jar</packaging> - <properties> - <main.basedir>${project.parent.basedir}</main.basedir> - </properties> <dependencies> <dependency> <groupId>org.immutables</groupId> @@ -36,7 +51,6 @@ <artifactId>commons-lang3</artifactId> </dependency> - <!-- TEST DEPENDENCIES--> <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-api</artifactId> @@ -53,7 +67,6 @@ <scope>test</scope> </dependency> - <!-- LOGGING DEPENDENCIES--> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> @@ -67,4 +80,4 @@ <artifactId>log4j-over-slf4j</artifactId> </dependency> </dependencies> -</project>
\ No newline at end of file +</project> diff --git a/prh-commons/src/test/resources/logback-test.xml b/prh-commons/src/test/resources/logback-test.xml new file mode 100644 index 00000000..c1f00665 --- /dev/null +++ b/prh-commons/src/test/resources/logback-test.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ ===============================LICENSE_START====================================== + ~ Copyright © 2017 AT&T Intellectual Property. All rights reserved. + ~ ================================================================================ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + ~ ============================LICENSE_END=========================================== + --> +<configuration> + <root level="OFF"/> +</configuration> diff --git a/prh-dmaap-client/pom.xml b/prh-dmaap-client/pom.xml index 8e1a57e0..d771c0b3 100644 --- a/prh-dmaap-client/pom.xml +++ b/prh-dmaap-client/pom.xml @@ -18,27 +18,22 @@ ~ limitations under the License. ~ ============LICENSE_END========================================================= --> -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://maven.apache.org/POM/4.0.0" - 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> - <artifactId>prh</artifactId> <groupId>org.onap.dcaegen2.services</groupId> + <artifactId>prh</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>prh-dmaap-client</artifactId> <groupId>org.onap.dcaegen2.services.prh</groupId> + <artifactId>prh-dmaap-client</artifactId> <packaging>jar</packaging> - - <properties> - <main.basedir>${project.parent.basedir}</main.basedir> - </properties> <dependencies> - - <!-- DEVELOPMENT DEPENDENCIES --> <dependency> <groupId>org.immutables</groupId> <artifactId>value</artifactId> @@ -49,23 +44,22 @@ </dependency> <dependency> <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> <artifactId>spring-webflux</artifactId> - <version>5.0.5.RELEASE</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-reactor-netty</artifactId> - <version>2.0.4.RELEASE</version> </dependency> <dependency> <groupId>org.onap.dcaegen2.services.prh</groupId> <artifactId>prh-commons</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> - - <!-- LOGGING DEPENDENCIES --> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> @@ -79,8 +73,6 @@ <artifactId>log4j-over-slf4j</artifactId> </dependency> - - <!-- TEST DEPENDENCIES--> <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-api</artifactId> @@ -102,10 +94,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - </dependency> - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>test</scope> @@ -116,4 +104,4 @@ <scope>test</scope> </dependency> </dependencies> -</project>
\ No newline at end of file +</project> diff --git a/prh-dmaap-client/src/test/resources/logback-test.xml b/prh-dmaap-client/src/test/resources/logback-test.xml new file mode 100644 index 00000000..c1f00665 --- /dev/null +++ b/prh-dmaap-client/src/test/resources/logback-test.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ ===============================LICENSE_START====================================== + ~ Copyright © 2017 AT&T Intellectual Property. All rights reserved. + ~ ================================================================================ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + ~ ============================LICENSE_END=========================================== + --> +<configuration> + <root level="OFF"/> +</configuration> |