Author: dennisl
Date: Tue Apr 8 10:14:27 2014
New Revision: 1585675
URL: http://svn.apache.org/r1585675
Log:
[MCHECKSTYLE-225] headerLocation no longer sets checkstyle.header.file
- Add an IT that fails (it works with 2.11)
Added:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/build-tools/
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/build-tools/pom.xml
(with props)
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/build-tools/src/
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/build-tools/src/main/
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/build-tools/src/main/resources/
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/build-tools/src/main/resources/test/
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/build-tools/src/main/resources/test/custom-header.txt
(with props)
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/core/
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/core/pom.xml
(with props)
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/invoker.properties
(with props)
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/pom.xml
(with props)
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/verify.groovy
(with props)
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
Modified: maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/pom.xml?rev=1585675&r1=1585674&r2=1585675&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/pom.xml Tue Apr 8 10:14:27 2014
@@ -257,9 +257,10 @@ under the License.
-->
<exclude>src/it/multi-modules-aggregate/child-b/src/test/java/org/apache/maven/plugins/checkstyle/its/AppTest.java</exclude>
<!--
- This is a license header template.
+ These are license header templates.
-->
<exclude>src/main/resources/config/maven-header.txt</exclude>
+
<exclude>src/it/MCHECKSTYLE-225/build-tools/src/main/resources/test/custom-header.txt</exclude>
<!--
File from the Checkstyle distribution - do not add our own
license header.
-->
Added:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/build-tools/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/build-tools/pom.xml?rev=1585675&view=auto
==============================================================================
---
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/build-tools/pom.xml
(added)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/build-tools/pom.xml
Tue Apr 8 10:14:27 2014
@@ -0,0 +1,29 @@
+<?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/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.checkstyle</groupId>
+ <artifactId>mcheckstyle-225-build-tools</artifactId>
+ <version>1.0-SNAPSHOT</version>
+</project>
Propchange:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/build-tools/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/build-tools/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author Id
Added:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/build-tools/src/main/resources/test/custom-header.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/build-tools/src/main/resources/test/custom-header.txt?rev=1585675&view=auto
==============================================================================
---
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/build-tools/src/main/resources/test/custom-header.txt
(added)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/build-tools/src/main/resources/test/custom-header.txt
Tue Apr 8 10:14:27 2014
@@ -0,0 +1 @@
+This is a custom header file.
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/build-tools/src/main/resources/test/custom-header.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/build-tools/src/main/resources/test/custom-header.txt
------------------------------------------------------------------------------
svn:keywords = Date Revision Author Id
Added:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/core/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/core/pom.xml?rev=1585675&view=auto
==============================================================================
---
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/core/pom.xml
(added)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/core/pom.xml
Tue Apr 8 10:14:27 2014
@@ -0,0 +1,61 @@
+<?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/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.checkstyle</groupId>
+ <artifactId>mcheckstyle-225-core</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>@pom.version@</version>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mcheckstyle-225-build-tools</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>check</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <headerLocation>test/custom-header.txt</headerLocation>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/core/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/core/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author Id
Added:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/invoker.properties?rev=1585675&view=auto
==============================================================================
---
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/invoker.properties
(added)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/invoker.properties
Tue Apr 8 10:14:27 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.debug = true
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/invoker.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/invoker.properties
------------------------------------------------------------------------------
svn:keywords = Date Revision Author Id
Added:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/pom.xml?rev=1585675&view=auto
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/pom.xml
(added)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/pom.xml
Tue Apr 8 10:14:27 2014
@@ -0,0 +1,35 @@
+<?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/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.checkstyle</groupId>
+ <artifactId>mcheckstyle-225</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>build-tools</module>
+ <module>core</module>
+ </modules>
+</project>
Propchange:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author Id
Added:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/verify.groovy
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/verify.groovy?rev=1585675&view=auto
==============================================================================
---
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/verify.groovy
(added)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/verify.groovy
Tue Apr 8 10:14:27 2014
@@ -0,0 +1,22 @@
+
+/*
+ * 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' )
+
+assert buildLog.text.contains( "The resource 'test/custom-header.txt' was
found" )
Propchange:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/verify.groovy
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-225/verify.groovy
------------------------------------------------------------------------------
svn:keywords = Date Revision Author Id
