You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2014/08/19 22:27:03 UTC
svn commit: r1618970 - in
/maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-70-multi-sourcefolder:
./ src/ src/additional/ src/additional/java/ src/additional/java/org/
src/test-additional/ src/test-additional/java/ src/test-additional/ja...
Author: rfscholte
Date: Tue Aug 19 20:27:02 2014
New Revision: 1618970
URL: http://svn.apache.org/r1618970
Log:
[MCHECKSTYLE-70] Support for multiple source folders
Forgot to add matching IT
Added:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-70-multi-sourcefolder/
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-70-multi-sourcefolder/invoker.properties
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-70-multi-sourcefolder/pom.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-70-multi-sourcefolder/src/
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-70-multi-sourcefolder/src/additional/
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-70-multi-sourcefolder/src/additional/java/
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-70-multi-sourcefolder/src/additional/java/org/
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-70-multi-sourcefolder/src/additional/java/org/MyClass.java
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-70-multi-sourcefolder/src/test-additional/
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-70-multi-sourcefolder/src/test-additional/java/
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-70-multi-sourcefolder/src/test-additional/java/org/
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-70-multi-sourcefolder/src/test-additional/java/org/MyClassTest.java
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-70-multi-sourcefolder/verify.groovy
Added: maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-70-multi-sourcefolder/invoker.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-70-multi-sourcefolder/invoker.properties?rev=1618970&view=auto
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-70-multi-sourcefolder/invoker.properties (added)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-70-multi-sourcefolder/invoker.properties Tue Aug 19 20:27:02 2014
@@ -0,0 +1,19 @@
+# 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.
+
+invoker.goals=verify
+invoker.buildResult=failure
Added: maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-70-multi-sourcefolder/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-70-multi-sourcefolder/pom.xml?rev=1618970&view=auto
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-70-multi-sourcefolder/pom.xml (added)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-70-multi-sourcefolder/pom.xml Tue Aug 19 20:27:02 2014
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+
+<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>
+
+ <groupId>org.apache.maven.plugins.checkstyle</groupId>
+ <artifactId>multi-sourcefolder</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <url>http://jira.codehaus.org/browse/MCHECKSTYLE-70</url>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>main-source</id>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>src/additional/java</source>
+ </sources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>test-source</id>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>src/test-additional/java</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>@project.version@</version>
+ <executions>
+ <execution>
+ <id>check</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-70-multi-sourcefolder/src/additional/java/org/MyClass.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-70-multi-sourcefolder/src/additional/java/org/MyClass.java?rev=1618970&view=auto
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-70-multi-sourcefolder/src/additional/java/org/MyClass.java (added)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-70-multi-sourcefolder/src/additional/java/org/MyClass.java Tue Aug 19 20:27:02 2014
@@ -0,0 +1,24 @@
+package org;
+
+/*
+ * 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.
+ */
+
+public class MyClass
+{
+}
Added: maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-70-multi-sourcefolder/src/test-additional/java/org/MyClassTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-70-multi-sourcefolder/src/test-additional/java/org/MyClassTest.java?rev=1618970&view=auto
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-70-multi-sourcefolder/src/test-additional/java/org/MyClassTest.java (added)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-70-multi-sourcefolder/src/test-additional/java/org/MyClassTest.java Tue Aug 19 20:27:02 2014
@@ -0,0 +1,23 @@
+package org;
+
+/*
+ * 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.
+ */
+
+public class MyClassTest {
+}
Added: maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-70-multi-sourcefolder/verify.groovy
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-70-multi-sourcefolder/verify.groovy?rev=1618970&view=auto
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-70-multi-sourcefolder/verify.groovy (added)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-70-multi-sourcefolder/verify.groovy Tue Aug 19 20:27:02 2014
@@ -0,0 +1,23 @@
+
+/*
+ * 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.
+ */
+def buildLog = new File( basedir, 'build.log' )
+
+// 3 errors in src/additional/java and 2 errors in src/test-additional/java
+assert buildLog.text.contains( "[INFO] There are 5 checkstyle errors." )