Skip to content

NLIC-2360: Update code style plugins #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
r-brown merged 7 commits into from
Feb 4, 2022
Merged

NLIC-2360: Update code style plugins #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
79971dc
Update code style plugins
r-brown Jan 31, 2022
90c821a
Rename labs64-rulesets to labs64-code-analysis
r-brown Feb 1, 2022
22434d0
Small logging fixes
r-brown Feb 1, 2022
4164261
Use site phase
r-brown Feb 2, 2022
fc00c8a
Add site plugin
r-brown Feb 2, 2022
6ffa9a4
Use parameter for failOnViolation
r-brown Feb 3, 2022
2ba1b4b
Merge branch 'master' into NLIC-2360-update-code-style-plugins
r-brown Feb 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...censingClient-demo/src/main/java/com/labs64/netlicensing/demo/NetLicensingClientDemo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ public static void main(final String[] args) {
}

if (cmd.hasOption("l")) {
System.out.println("Available examples:");
AllExamples.list.forEach((key, val) -> {
System.out.println("Available examples:");
System.out.println(" " + key);
});
return;
Expand Down
4 changes: 2 additions & 2 deletions NetLicensingClient-demo/src/main/resources/log4j2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<Configuration>

<Appenders>
<Console name="nlic-console" target="SYSTEM_OUT">
<Console name="demo-console" target="SYSTEM_OUT">
<PatternLayout pattern="%d [%p] %m%n"/>
</Console>
</Appenders>

<Loggers>
<Root level="info">
<AppenderRef ref="nlic-console"/>
<AppenderRef ref="demo-console"/>
</Root>
</Loggers>

Expand Down
13 changes: 13 additions & 0 deletions NetLicensingClient/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,19 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
114 changes: 113 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<maven-javadoc-plugin.version>3.3.0</maven-javadoc-plugin.version>
<maven-site-plugin.version>3.9.1</maven-site-plugin.version>
<maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>
<maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<!-- TODO(AY): change version when the new release comes. Java 11 Warning https://github.com/highsource/maven-jaxb2-plugin/issues/148 -->
Expand All @@ -103,6 +104,13 @@
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
<maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
<maven-bundle-plugin.version>5.1.1</maven-bundle-plugin.version>
<!-- Code Analysis -->
<labs64.code-analysis.version>2.0.1</labs64.code-analysis.version>
<labs64.code-analysis.phase>site</labs64.code-analysis.phase>
<labs64.code-analysis.failOnViolation>false</labs64.code-analysis.failOnViolation>
<maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
<spotbugs-maven-plugin.version>4.5.3.0</spotbugs-maven-plugin.version>
<maven-pmd-plugin.version>3.15.0</maven-pmd-plugin.version>
</properties>

<build>
Expand Down Expand Up @@ -131,6 +139,15 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>${maven-site-plugin.version}</version>
<configuration>
<locales>en</locales>
<outputEncoding>UTF-8</outputEncoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
Expand Down Expand Up @@ -270,6 +287,97 @@
<artifactId>maven-bundle-plugin</artifactId>
<version>${maven-bundle-plugin.version}</version>
</plugin>

<!-- https://maven.apache.org/plugins/maven-checkstyle-plugin/usage.html -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${maven-checkstyle-plugin.version}</version>
<configuration>
<configLocation>labs64-code-analysis/checkstyle.xml</configLocation>
<failsOnError>${labs64.code-analysis.failOnViolation}</failsOnError>
<propertyExpansion>basedir=${project.basedir}</propertyExpansion>
<excludes>**/generated-sources/**/*</excludes>
</configuration>
<executions>
<execution>
<id>checkstyle</id>
<phase>${labs64.code-analysis.phase}</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>com.labs64.commons</groupId>
<artifactId>code-analysis</artifactId>
<version>${labs64.code-analysis.version}</version>
</dependency>
</dependencies>
</plugin>

<!-- https://spotbugs.github.io -->
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>${spotbugs-maven-plugin.version}</version>
<configuration>
<includeFilterFile>labs64-code-analysis/spotbugs.xml</includeFilterFile>
<onlyAnalyze>com.labs64.-</onlyAnalyze>
<failOnError>${labs64.code-analysis.failOnViolation}</failOnError>
</configuration>
<executions>
<execution>
<id>spotbugs</id>
<phase>${labs64.code-analysis.phase}</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>com.labs64.commons</groupId>
<artifactId>code-analysis</artifactId>
<version>${labs64.code-analysis.version}</version>
</dependency>
</dependencies>
</plugin>

<!-- https://maven.apache.org/plugins/maven-pmd-plugin/usage.html -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>${maven-pmd-plugin.version}</version>
<configuration>
<rulesets>
<ruleset>labs64-code-analysis/pmd.xml</ruleset>
</rulesets>
<excludeRoots>
<excludeRoot>target/generated-sources/xjc</excludeRoot>
<excludeRoot>target/generated-sources/jaxws</excludeRoot>
</excludeRoots>
<failOnViolation>${labs64.code-analysis.failOnViolation}</failOnViolation>
<printFailingErrors>true</printFailingErrors>
</configuration>
<executions>
<execution>
<id>pmd</id>
<phase>${labs64.code-analysis.phase}</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>com.labs64.commons</groupId>
<artifactId>code-analysis</artifactId>
<version>${labs64.code-analysis.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</pluginManagement>

Expand All @@ -278,6 +386,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
</plugin>
</plugins>
</build>

Expand Down