diff options
author | Pamela Dragosh <pdragosh@research.att.com> | 2018-09-21 12:48:29 -0400 |
---|---|---|
committer | Pamela Dragosh <pdragosh@research.att.com> | 2018-09-21 14:33:06 -0400 |
commit | af5e28cc353456a28204ce8ebe792a218607d8c9 (patch) | |
tree | 4c21586f87fce9dedc7d4d106fe559a8f119c4e8 /common-logging/pom.xml | |
parent | 9a42498247f49a09b56c381ddb009e02127c2234 (diff) |
Fix policy/common checkstyle issues
The root pom.xml had a syntax error in a declaration. The suppressions
xml was not being found by the sub-modules. It was better to create a
copy in each of the sub-modules where we will not be fixing
abbreviations or the interface declarations in own java file.
Added specific checkstyle files for each submodule.
One interesting note for the InheritDoc tag. It seems that the mvn
compile has a bug that interprets these as missing a period after
the tag. Even though the parent interface has it correctly. It was
easier to just remove it than duplicate.
There are new JIRA's for that work to be done in Dublin.
Fixed some spacing in pom's.
Issue-ID: POLICY-1131
Change-Id: I5f845958ccefd50a3b7290662da43c994870f1f7
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Diffstat (limited to 'common-logging/pom.xml')
-rw-r--r-- | common-logging/pom.xml | 203 |
1 files changed, 121 insertions, 82 deletions
diff --git a/common-logging/pom.xml b/common-logging/pom.xml index 143ae6b8..2d3186b9 100644 --- a/common-logging/pom.xml +++ b/common-logging/pom.xml @@ -18,92 +18,131 @@ ============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> +<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.policy.common</groupId> - <artifactId>common-modules</artifactId> - <version>1.3.0-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.onap.policy.common</groupId> + <artifactId>common-modules</artifactId> + <version>1.3.0-SNAPSHOT</version> + </parent> - <artifactId>ONAP-Logging</artifactId> - <description>ONAP Logging Framework</description> - <packaging>jar</packaging> - - <properties> - <powermock.version>1.6.6</powermock.version> - </properties> + <artifactId>ONAP-Logging</artifactId> + <description>ONAP Logging Framework</description> + <packaging>jar</packaging> + + <properties> + <powermock.version>1.6.6</powermock.version> + </properties> + + <dependencies> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>com.att.eelf</groupId> + <artifactId>eelf-core</artifactId> + <version>1.0.1-oss</version> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-api-mockito</artifactId> + <version>${powermock.version}</version> + <scope>test</scope> + </dependency> + </dependencies> - <dependencies> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>com.att.eelf</groupId> - <artifactId>eelf-core</artifactId> - <version>1.0.1-oss</version> - </dependency> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito</artifactId> - <version>${powermock.version}</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>com.att.eelf</groupId> - <artifactId>eelf-maven-plugin</artifactId> - <version>0.0.1</version> - <executions> - <execution> - <phase>install</phase> - <goals> - <goal>WikiMsgGenerator</goal> - </goals> - </execution> - </executions> - <dependencies> - <!-- We need to include the dependency of the project so that its include - in classpath when running plugin --> - <dependency> - <groupId>org.onap.policy.common</groupId> - <artifactId>ONAP-Logging</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - <configuration> - <outputDirectory>target/messages</outputDirectory> - <outputFile>messages.html</outputFile> - <resources> - <resource> - <messageClass>org.onap.policy.common.logging.eelf.MessageCodes</messageClass> - This needs to be replaced with your Enum class name .which - implements EELFResolvableErrorEnum and have your defined error - codes. - <header><![CDATA[<p> <ac:macro ac:name="toc" /> </p> + <build> + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <executions> + <execution> + <id>onap-java-style</id> + <goals> + <goal>check</goal> + </goals> + <phase>process-sources</phase> + <configuration> + <!-- Use Google Java Style Guide: + https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml + with minor changes --> + <configLocation>onap-checkstyle/onap-java-style.xml</configLocation> + <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory --> + <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory> + <includeResources>true</includeResources> + <includeTestSourceDirectory>true</includeTestSourceDirectory> + <includeTestResources>true</includeTestResources> + <excludes> + </excludes> + <suppressionsLocation>${project.basedir}/checkstyle-suppressions.xml</suppressionsLocation> + <consoleOutput>true</consoleOutput> + <failsOnViolation>true</failsOnViolation> + <violationSeverity>warning</violationSeverity> + </configuration> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.onap.oparent</groupId> + <artifactId>checkstyle</artifactId> + <version>${oparent.version}</version> + <scope>compile</scope> + </dependency> + </dependencies> + </plugin> + <plugin> + <groupId>com.att.eelf</groupId> + <artifactId>eelf-maven-plugin</artifactId> + <version>0.0.1</version> + <executions> + <execution> + <phase>install</phase> + <goals> + <goal>WikiMsgGenerator</goal> + </goals> + </execution> + </executions> + <dependencies> + <!-- We need to include the dependency of the project so that its include + in classpath when running plugin --> + <dependency> + <groupId>org.onap.policy.common</groupId> + <artifactId>ONAP-Logging</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + <configuration> + <outputDirectory>target/messages</outputDirectory> + <outputFile>messages.html</outputFile> + <resources> + <resource> + <messageClass>org.onap.policy.common.logging.eelf.MessageCodes</messageClass> + This needs to be replaced with your Enum + class name .which + implements EELFResolvableErrorEnum and have your defined error + codes. + <header><![CDATA[<p> <ac:macro ac:name="toc" /> </p> <p> <ac:macro ac:name="anchor"> <ac:default-parameter>Application Messages</ac:default-parameter> </ac:macro> </p> <h2>Application Messages</h2>]]></header> - </resource> + </resource> - </resources> - </configuration> - </plugin> - </plugins> - </build> + </resources> + </configuration> + </plugin> + </plugins> + </build> </project> |