cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntimof...@apache.org
Subject [1/2] cayenne git commit: Add suppressions to checkstyle
Date Wed, 07 Feb 2018 11:55:19 GMT
Repository: cayenne
Updated Branches:
  refs/heads/master e88edcf58 -> 383cfb0d0


Add suppressions to checkstyle


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/5cc51157
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/5cc51157
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/5cc51157

Branch: refs/heads/master
Commit: 5cc51157dee908266f8e7b715acf5536ec8452ce
Parents: 750d3d5
Author: Arseni Bulatski <ancarseni@gmail.com>
Authored: Tue Feb 6 17:46:12 2018 +0300
Committer: Arseni Bulatski <ancarseni@gmail.com>
Committed: Tue Feb 6 17:46:12 2018 +0300

----------------------------------------------------------------------
 .../cayenne-checkstyle-suppression.xml          | 37 ++++++++++++++++
 .../cayenne-checkstyle-suppression.xml          | 45 --------------------
 cayenne-server/pom.xml                          | 40 -----------------
 pom.xml                                         | 25 +++++++----
 4 files changed, 53 insertions(+), 94 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/5cc51157/build-tools/cayenne-checkers/src/main/resources/cayenne-checkstyle-suppression.xml
----------------------------------------------------------------------
diff --git a/build-tools/cayenne-checkers/src/main/resources/cayenne-checkstyle-suppression.xml
b/build-tools/cayenne-checkers/src/main/resources/cayenne-checkstyle-suppression.xml
new file mode 100644
index 0000000..7f6ec0c
--- /dev/null
+++ b/build-tools/cayenne-checkers/src/main/resources/cayenne-checkstyle-suppression.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
+  -->
+<!DOCTYPE suppressions PUBLIC
+        "-//Puppy Crawl//DTD Suppressions 1.1//EN"
+        "suppressions_1_1.dtd">
+
+<suppressions>
+    <!-- Suppress all checkstyle for autogenerated javacc package -->
+    <suppress checks=".*" files="org.apache.cayenne.ejbql.parser.*"/>
+    <suppress checks=".*" files="org.apache.cayenne.template.parser.*"/>
+    <suppress checks=".*" files="org.apache.cayenne.exp.parser.*"/>
+    <suppress checks=".*" files="org.apache.cayenne.wocompat.parser.ParseException.java"/>
+    <suppress checks=".*" files="org.apache.cayenne.wocompat.parser.Parser.java.java"/>
+    <suppress checks=".*" files="org.apache.cayenne.wocompat.parser.ParserConstants.java"/>
+    <suppress checks=".*" files="org.apache.cayenne.wocompat.parser.ParserTokenManager.java"/>
+    <suppress checks=".*" files="org.apache.cayenne.wocompat.parser.SimpleCharStream.java"/>
+    <suppress checks=".*" files="org.apache.cayenne.wocompat.parser.TokenMgrError.java"/>
+
+</suppressions>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/5cc51157/cayenne-server/cayenne-checkstyle-suppression.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/cayenne-checkstyle-suppression.xml b/cayenne-server/cayenne-checkstyle-suppression.xml
deleted file mode 100644
index 2c8bb34..0000000
--- a/cayenne-server/cayenne-checkstyle-suppression.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you 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.
-  -->
-<!DOCTYPE suppressions PUBLIC
-        "-//Puppy Crawl//DTD Suppressions 1.1//EN"
-        "suppressions_1_1.dtd">
-
-<suppressions>
-    <!-- Suppress all checkstyle for autogenerated javacc package -->
-    <suppress checks=".*" files="org.apache.cayenne.ejbql.parser.*"/>
-    <suppress checks=".*" files="org.apache.cayenne.exp.parser.ExpressionParserTreeConstants.java"/>
-    <suppress checks=".*" files="org.apache.cayenne.exp.parser.JavaCharStream.java"/>
-    <suppress checks=".*" files="org.apache.cayenne.exp.parser.JJTExpressionParserState.java"/>
-    <suppress checks=".*" files="org.apache.cayenne.exp.parser.ParseException.java"/>
-    <suppress checks=".*" files="org.apache.cayenne.exp.parser.Token.java"/>
-    <suppress checks=".*" files="org.apache.cayenne.exp.parser.TokenMgrError.java"/>
-    <suppress checks=".*" files="org.apache.cayenne.exp.parser.ExpressionParser.java"/>
-    <suppress checks=".*" files="org.apache.cayenne.exp.parser.ExpressionParserConstants.java"/>
-    <suppress checks=".*" files="org.apache.cayenne.exp.parser.ExpressionParserTokenManager.java"/>
-    <suppress checks=".*" files="org.apache.cayenne.exp.parser.SimpleNode.java"/>
-    <suppress checks=".*" files="org.apache.cayenne.wocompat.parser.ParseException.java"/>
-    <suppress checks=".*" files="org.apache.cayenne.wocompat.parser.Parser.java.java"/>
-    <suppress checks=".*" files="org.apache.cayenne.wocompat.parser.ParserConstants.java"/>
-    <suppress checks=".*" files="org.apache.cayenne.wocompat.parser.ParserTokenManager.java"/>
-    <suppress checks=".*" files="org.apache.cayenne.wocompat.parser.SimpleCharStream.java"/>
-    <suppress checks=".*" files="org.apache.cayenne.wocompat.parser.TokenMgrError.java"/>
-
-</suppressions>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/5cc51157/cayenne-server/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/pom.xml b/cayenne-server/pom.xml
index 8bda80e..6f0a8c2 100644
--- a/cayenne-server/pom.xml
+++ b/cayenne-server/pom.xml
@@ -303,45 +303,5 @@
 				</plugins>
 			</build>
 		</profile>
-        <profile>
-            <id>code-quality</id>
-
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-checkstyle-plugin</artifactId>
-                        <configuration>
-                            <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-pmd-plugin</artifactId>
-                        <configuration>
-                            <excludes>
-                                <exclude>**/ExpressionParserTreeConstants.java</exclude>
-                                <exclude>**/JavaCharStream.java</exclude>
-                                <exclude>**/JJTExpressionParserState.java</exclude>
-                                <exclude>**/ParseException.java</exclude>
-                                <exclude>**/Token.java</exclude>
-                                <exclude>**/TokenMgrError.java</exclude>
-                                <exclude>**/ExpressionParser.java</exclude>
-                                <exclude>**/ExpressionParserConstants.java</exclude>
-                                <exclude>**/ExpressionParserTokenManager.java</exclude>
-                                <exclude>**/SimpleNode.java</exclude>
-                                <exclude>**/ParseException.java</exclude>
-                                <exclude>**/Parser.java.java</exclude>
-                                <exclude>**/ParserConstants.java</exclude>
-                                <exclude>**/ParserTokenManager.java</exclude>
-                                <exclude>**/SimpleCharStream.java</exclude>
-                                <exclude>**/TokenMgrError.java</exclude>
-                                <exclude>org/apache/cayenne/ejbql/parser/*</exclude>
-								<exclude>org/apache/cayenne/exp/parser/*</exclude>
-								<exclude>org/apache/cayenne/template/parser/*</exclude>
-                            </excludes>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/5cc51157/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e3a1199..c6ad426 100644
--- a/pom.xml
+++ b/pom.xml
@@ -967,14 +967,14 @@
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-checkstyle-plugin</artifactId>
 						<configuration>
-
 							<skip>false</skip>
 							<consoleOutput>false</consoleOutput>
 							<enableRulesSummary>false</enableRulesSummary>
 							<failOnViolation>false</failOnViolation>
 							<!-- TODO make it 'true' when we will be ready -->
 							<violationSeverity>warning</violationSeverity>
-							<configLocation>/cayenne-checkstyle.xml</configLocation>
+							<configLocation>build-tools/cayenne-checkers/src/main/resources/cayenne-checkstyle.xml</configLocation>
+							<suppressionsLocation>build-tools/cayenne-checkers/src/main/resources/cayenne-checkstyle-suppression.xml</suppressionsLocation>
 						</configuration>
 						<executions>
 							<execution>
@@ -984,13 +984,6 @@
 								</goals>
 							</execution>
 						</executions>
-						<dependencies>
-							<dependency>
-								<groupId>org.apache.cayenne.build-tools</groupId>
-								<artifactId>cayenne-checkers</artifactId>
-								<version>${project.version}</version>
-							</dependency>
-						</dependencies>
 					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
@@ -1007,6 +1000,20 @@
 								<!-- go back on one dir to parent project -->
 								<ruleset>/cayenne-pmd.xml</ruleset>
 							</rulesets>
+							<excludes>
+								<exclude>**/ParseException.java</exclude>
+								<exclude>**/Token.java</exclude>
+								<exclude>**/TokenMgrError.java</exclude>
+								<exclude>**/ParseException.java</exclude>
+								<exclude>**/Parser.java.java</exclude>
+								<exclude>**/ParserConstants.java</exclude>
+								<exclude>**/ParserTokenManager.java</exclude>
+								<exclude>**/SimpleCharStream.java</exclude>
+								<exclude>**/TokenMgrError.java</exclude>
+								<exclude>org/apache/cayenne/ejbql/parser/*</exclude>
+								<exclude>org/apache/cayenne/exp/parser/*</exclude>
+								<exclude>org/apache/cayenne/template/parser/*</exclude>
+							</excludes>
 						</configuration>
 						<executions>
 							<execution>


Mime
View raw message