This is an automated email from the ASF dual-hosted git repository.
garyw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mnemonic.git
The following commit(s) were added to refs/heads/master by this push:
new 65b8eea Fix SuppressionFilter initialization failure
new 65c06f7 Merge pull request #120 from bigdata-memory/chkstyle
65b8eea is described below
commit 65b8eeae1c75eaf9c05317a678dd35c3f7da519d
Author: Gary <[email protected]>
AuthorDate: Sat Jul 18 13:47:59 2020 -0700
Fix SuppressionFilter initialization failure
---
bin/mnemonic-checkstyle.xml | 3 ---
mnemonic-core/pom.xml | 7 +++----
mnemonic-memory-services/mnemonic-nvml-vmem-service/pom.xml | 6 +++---
pom.xml | 4 +++-
4 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/bin/mnemonic-checkstyle.xml b/bin/mnemonic-checkstyle.xml
index 913cd1b..da59e0d 100644
--- a/bin/mnemonic-checkstyle.xml
+++ b/bin/mnemonic-checkstyle.xml
@@ -164,7 +164,4 @@
<module name="SuppressionCommentFilter"/>
- <module name="SuppressionFilter">
- <property name="file" value="bin/suppressions.xml"/>
- </module>
</module>
diff --git a/mnemonic-core/pom.xml b/mnemonic-core/pom.xml
index ceb2a72..39e6cc7 100644
--- a/mnemonic-core/pom.xml
+++ b/mnemonic-core/pom.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>com.squareup</groupId>
<artifactId>javapoet</artifactId>
- </dependency>
+ </dependency>
<!-- logging dependencies -->
<!-- For core, assume all APIs will be used -->
<dependency>
@@ -184,7 +184,7 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Xmx2g -XX:MaxPermSize=1g</argLine>
@@ -192,11 +192,10 @@
<suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>
</suiteXmlFiles>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
-
diff --git a/mnemonic-memory-services/mnemonic-nvml-vmem-service/pom.xml
b/mnemonic-memory-services/mnemonic-nvml-vmem-service/pom.xml
index e4e55af..88c4bbc 100644
--- a/mnemonic-memory-services/mnemonic-nvml-vmem-service/pom.xml
+++ b/mnemonic-memory-services/mnemonic-nvml-vmem-service/pom.xml
@@ -27,7 +27,7 @@
<artifactId>mnemonic-memory-services</artifactId>
<version>0.12.0-SNAPSHOT</version>
</parent>
-
+
<artifactId>mnemonic-nvml-vmem-service</artifactId>
<name>mnemonic-nvml-vmem-service</name>
@@ -150,7 +150,7 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Xmx2g -XX:MaxPermSize=1g</argLine>
@@ -158,7 +158,7 @@
<suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>
</suiteXmlFiles>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
</profile>
diff --git a/pom.xml b/pom.xml
index 8039ac9..0275859 100644
--- a/pom.xml
+++ b/pom.xml
@@ -290,9 +290,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
+ <version>3.0.0</version>
<configuration>
<configLocation>bin/mnemonic-checkstyle.xml</configLocation>
+ <suppressionsLocation>bin/suppressions.xml</suppressionsLocation>
+
<suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<encoding>UTF-8</encoding>
<failOnViolation>true</failOnViolation>
