mahout-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bimargul...@apache.org
Subject svn commit: r927029 - in /lucene/mahout/trunk: ./ buildtools/ buildtools/src/ buildtools/src/main/ buildtools/src/main/resources/
Date Wed, 24 Mar 2010 12:23:19 GMT
Author: bimargulies
Date: Wed Mar 24 12:23:18 2010
New Revision: 927029

URL: http://svn.apache.org/viewvc?rev=927029&view=rev
Log:
Get -Psourcecheck working right, using classpath references for PMD rules and checkstyle rules.


Added:
    lucene/mahout/trunk/buildtools/
    lucene/mahout/trunk/buildtools/pom.xml   (with props)
    lucene/mahout/trunk/buildtools/src/
    lucene/mahout/trunk/buildtools/src/main/
    lucene/mahout/trunk/buildtools/src/main/resources/
    lucene/mahout/trunk/buildtools/src/main/resources/mahout-checkstyle-suppressions.xml
      - copied unchanged from r927024, lucene/mahout/trunk/etc/mahout-checkstyle-suppressions.xml
    lucene/mahout/trunk/buildtools/src/main/resources/mahout-checkstyle.xml
      - copied unchanged from r927024, lucene/mahout/trunk/etc/mahout-checkstyle.xml
    lucene/mahout/trunk/buildtools/src/main/resources/mahout-pmd-ruleset.xml
      - copied unchanged from r927024, lucene/mahout/trunk/etc/mahout-pmd-ruleset.xml
Modified:
    lucene/mahout/trunk/pom.xml

Added: lucene/mahout/trunk/buildtools/pom.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/buildtools/pom.xml?rev=927029&view=auto
==============================================================================
--- lucene/mahout/trunk/buildtools/pom.xml (added)
+++ lucene/mahout/trunk/buildtools/pom.xml Wed Mar 24 12:23:18 2010
@@ -0,0 +1,42 @@
+<?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.mahout</groupId>
+  <artifactId>mahout-buildtools</artifactId>
+  <version>0.4-SNAPSHOT</version>
+
+  <parent>
+    <groupId>org.apache</groupId>
+    <artifactId>apache</artifactId>
+    <version>6</version>
+  </parent>
+  
+  <name>Buildtools - jar file used to configure PMD and Checkstyle</name>
+
+  <packaging>jar</packaging>
+
+  <scm>
+    <connection>scm:svn:https://svn.apache.org/repos/asf/lucene/mahout/trunk/buildtools</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/lucene/mahout/trunk/buildtools</developerConnection>
+    <url>https://svn.apache.org/repos/asf/lucene/mahout/mahout-core</url>
+  </scm>
+</project>

Propchange: lucene/mahout/trunk/buildtools/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: lucene/mahout/trunk/buildtools/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: lucene/mahout/trunk/pom.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/pom.xml?rev=927029&r1=927028&r2=927029&view=diff
==============================================================================
--- lucene/mahout/trunk/pom.xml (original)
+++ lucene/mahout/trunk/pom.xml Wed Mar 24 12:23:18 2010
@@ -310,12 +310,23 @@
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>2.0.2</version>
+                    <configuration>
+                        <encoding>UTF-8</encoding>
+                        <source>1.6</source>
+                        <target>1.6</target>
+                        <optimize>true</optimize>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>2.2</version>
+                    <version>2.5</version>
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.mahout</groupId>
-                            <artifactId>mahout</artifactId>
+                            <artifactId>mahout-buildtools</artifactId>
                             <version>${project.version}</version>
                         </dependency>
                     </dependencies>
@@ -327,7 +338,8 @@
                             <id>validate</id>
                             <phase>validate</phase>
                             <configuration>
-                                <configLocation>${project.build.directory}/../../maven/src/main/resources/mahout-checkstyle.xml</configLocation>
+                              <!-- classpath -->
+                                <configLocation>/mahout-checkstyle.xml</configLocation>
                                 <consoleOutput>true</consoleOutput>
                                 <failsOnError>false</failsOnError>
                                 <linkXRef>false</linkXRef>
@@ -340,47 +352,37 @@
                     </executions>
                 </plugin>
                 <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>2.0.2</version>
-                    <configuration>
-                        <encoding>UTF-8</encoding>
-                        <source>1.6</source>
-                        <target>1.6</target>
-                        <optimize>true</optimize>
-                    </configuration>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-pmd-plugin</artifactId>
+                  <version>2.4</version>
+                  <dependencies>
+                    <dependency>
+                      <groupId>org.apache.mahout</groupId>
+                      <artifactId>mahout-buildtools</artifactId>
+                      <version>${project.version}</version>
+                    </dependency>
+                  </dependencies>
+                  <configuration>
+                    <rulesets>
+                      <!-- classpath -->
+                      <ruleset>/mahout-pmd-ruleset.xml</ruleset>
+                    </rulesets>
+                    <sourceEncoding>UTF-8</sourceEncoding>
+                    <targetJdk>1.5</targetJdk>
+                    <linkXRef>false</linkXRef>
+                    <includeTests>true</includeTests>
+                    <verbose>true</verbose>
+                  </configuration>
+                  <executions>
+                    <execution>
+                      <id>validate</id>
+                      <phase>validate</phase>
+                      <goals>
+                        <goal>check</goal>
+                      </goals>
+                    </execution>
+                  </executions>
                 </plugin>
-                <!--plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-pmd-plugin</artifactId>
-          <version>2.4</version>
-          <dependencies>
-            <dependency>
-              <groupId>org.apache.mahout</groupId>
-              <artifactId>mahout</artifactId>
-              <version>${project.version}</version>
-            </dependency>
-          </dependencies>
-          <configuration>
-            <rulesets>
-              <ruleset>src/main/resources/mahout-pmd-ruleset.xml</ruleset>
-            </rulesets>
-            <sourceEncoding>UTF-8</sourceEncoding>
-            <targetJdk>1.5</targetJdk>
-            <linkXRef>false</linkXRef>
-            <includeTests>true</includeTests>
-            <verbose>true</verbose>
-          </configuration>
-          <executions>
-            <execution>
-              <id>validate</id>
-              <phase>validate</phase>
-              <goals>
-                <goal>check</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin-->
             </plugins>
         </pluginManagement>
         <plugins>
@@ -424,6 +426,7 @@
         </plugins>
     </build>
     <modules>
+        <module>buildtools</module>
         <module>eclipse</module>
         <module>collections-codegen-plugin</module>
         <module>collections</module>
@@ -518,17 +521,6 @@
             <id>sourcecheck</id>
             <build>
                 <plugins>
-                    <!--plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-checkstyle-plugin</artifactId>
-              <configuration>
-                <configLocation>src/main/resources/mahout-checkstyle.xml</configLocation>
-                <consoleOutput>false</consoleOutput>
-                <failsOnError>false</failsOnError>
-                <linkXRef>false</linkXRef>
-                <sourceDirectory>${basedir}/src</sourceDirectory>
-              </configuration>
-          </plugin-->
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-compiler-plugin</artifactId>
@@ -539,18 +531,12 @@
                         </configuration>
                     </plugin>
                     <plugin>
+                      <groupId>org.apache.maven.plugins</groupId>
+                      <artifactId>maven-checkstyle-plugin</artifactId>
+                    </plugin>
+                    <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-pmd-plugin</artifactId>
-                        <configuration>
-                            <rulesets>
-                                <ruleset>src/main/resources/mahout-pmd-ruleset.xml</ruleset>
-                            </rulesets>
-                            <sourceEncoding>UTF-8</sourceEncoding>
-                            <targetJdk>1.5</targetJdk>
-                            <linkXRef>false</linkXRef>
-                            <includeTests>true</includeTests>
-                            <verbose>true</verbose>
-                        </configuration>
                     </plugin>
                 </plugins>
             </build>
@@ -629,7 +615,7 @@
                 <artifactId>maven-pmd-plugin</artifactId>
                 <configuration>
                     <rulesets>
-                        <ruleset>src/main/resources/mahout-pmd-ruleset.xml</ruleset>
+                        <ruleset>/mahout-pmd-ruleset.xml</ruleset>
                     </rulesets>
                     <sourceEncoding>UTF-8</sourceEncoding>
                     <targetJdk>1.5</targetJdk>



Mime
View raw message