Author: olamy
Date: Tue Feb 16 21:37:09 2010
New Revision: 910704
URL: http://svn.apache.org/viewvc?rev=910704&view=rev
Log:
[MCHECKSTYLE-130] multimodule project requires src/main/java after 2.5 update
add an other it test.
Added:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/checkstyle-dekies.xml
(with props)
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/invoker.properties
(with props)
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/module1/
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/module1/pom.xml
(with props)
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/module1/src/
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/module1/src/main/
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/module1/src/main/java/
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/module2/
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/module2/pom.xml
(with props)
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/module2/src/
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/module2/src/main/
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/module2/src/main/java/
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/pom.xml
(with props)
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules/pom.xml
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules/pom.xml?rev=910704&r1=910703&r2=910704&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules/pom.xml
(original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules/pom.xml
Tue Feb 16 21:37:09 2010
@@ -16,7 +16,8 @@
~ 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";>
+ -->
+<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.its</groupId>
Added:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/checkstyle-dekies.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/checkstyle-dekies.xml?rev=910704&view=auto
==============================================================================
---
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/checkstyle-dekies.xml
(added)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/checkstyle-dekies.xml
Tue Feb 16 21:37:09 2010
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
"http://www.puppycrawl.com/dtds/configuration_1_2.dtd";>
+
+<module name="DEKIES">
+ <property name="localeCountry" value="DE"/>
+ <property name="localeLanguage" value="de"/>
+ <module name="TreeWalker">
+ <property name="fileExtensions" value="java,ejb,jpf"/>
+ <!-- Allow text only in catch-blocks -->
+ <module name="EmptyBlock">
+ <property name="option" value="text"/>
+ <property name="tokens" value="LITERAL_CATCH"/>
+ </module>
+ </module>
+</module>
Propchange:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/checkstyle-dekies.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/checkstyle-dekies.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/invoker.properties?rev=910704&view=auto
==============================================================================
---
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/invoker.properties
(added)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/invoker.properties
Tue Feb 16 21:37:09 2010
@@ -0,0 +1 @@
+invoker.goals=clean checkstyle:checkstyle
Propchange:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/invoker.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/invoker.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/module1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/module1/pom.xml?rev=910704&view=auto
==============================================================================
---
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/module1/pom.xml
(added)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/module1/pom.xml
Tue Feb 16 21:37:09 2010
@@ -0,0 +1,44 @@
+<?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>
+ <parent>
+ <groupId>de.dekies.test</groupId>
+ <artifactId>test-base</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>module1</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <build>
+ <defaultGoal>package</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/module1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/module1/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/module2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/module2/pom.xml?rev=910704&view=auto
==============================================================================
---
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/module2/pom.xml
(added)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/module2/pom.xml
Tue Feb 16 21:37:09 2010
@@ -0,0 +1,44 @@
+<?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>
+ <parent>
+ <groupId>de.dekies.test</groupId>
+ <artifactId>test-base</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>module2</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <build>
+ <defaultGoal>package</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/module2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/module2/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/pom.xml?rev=910704&view=auto
==============================================================================
---
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/pom.xml
(added)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/pom.xml
Tue Feb 16 21:37:09 2010
@@ -0,0 +1,55 @@
+<?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>de.dekies.test</groupId>
+ <artifactId>test-base</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <modules>
+ <module>module1</module>
+ <module>module2</module>
+ </modules>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>@pom.version@</version>
+ <!-- version>2.4</version -->
+ <configuration>
+ <!--
+ <configLocation>checkstyle-dekies.xml</configLocation>
+ -->
+ <consoleOutput>true</consoleOutput>
+ </configuration>
+ <executions>
+ <execution>
+ <id>checkstyle</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+
Propchange:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/multimoduleproject/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
