crunch-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jwi...@apache.org
Subject crunch git commit: CRUNCH-523: Enable checkstyle in build; refactor javadoc / checkstyle config to pluginManagement; remove unused site config; update plugin versions
Date Thu, 21 May 2015 21:11:11 GMT
Repository: crunch
Updated Branches:
  refs/heads/master d0bb205ea -> e90cf2782


CRUNCH-523: Enable checkstyle in build; refactor javadoc / checkstyle config to pluginManagement;
remove unused site config; update plugin versions

Signed-off-by: Josh Wills <jwills@apache.org>


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

Branch: refs/heads/master
Commit: e90cf2782d89e61f5c4f2a19a7879a1da357facc
Parents: d0bb205
Author: Sean Owen <sowen@cloudera.com>
Authored: Thu May 21 17:25:08 2015 +0100
Committer: Josh Wills <jwills@apache.org>
Committed: Thu May 21 13:49:29 2015 -0700

----------------------------------------------------------------------
 pom.xml           | 224 +++++++++++++++++++------------------------------
 src/site/site.xml |  65 --------------
 2 files changed, 85 insertions(+), 204 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/crunch/blob/e90cf278/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d47f6ff..942f203 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@ under the License.
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>11</version>
+    <version>16</version>
   </parent>
 
   <groupId>org.apache.crunch</groupId>
@@ -40,7 +40,7 @@ under the License.
   </description>
 
   <prerequisites>
-    <maven>2.2.1</maven>
+    <maven>3.0.4</maven>
   </prerequisites>
 
   <modules>
@@ -535,80 +535,16 @@ under the License.
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-        <inherited>false</inherited> 
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.maven.wagon</groupId>
-            <artifactId>wagon-ssh</artifactId>
-            <version>1.0</version>
-          </dependency>
-        </dependencies>
-        <configuration>
-          <inputEncoding>UTF-8</inputEncoding>
-          <outputEncoding>UTF-8</outputEncoding>
-          <reportPlugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-project-info-reports-plugin</artifactId>
-              <version>2.4</version>
-              <reportSets>
-                <reportSet>
-                  <reports>
-                    <report>cim</report>
-                    <report>issue-tracking</report>
-                    <report>license</report>
-                    <report>mailing-list</report>
-                    <report>project-team</report>
-                    <report>scm</report>
-                  </reports>
-                </reportSet>
-              </reportSets>
-            </plugin>
-          </reportPlugins>
-        </configuration>
+        <artifactId>maven-javadoc-plugin</artifactId>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.8.1</version>
-        <configuration>
-          <show>public</show>
-          <nohelp>true</nohelp>
-          <excludePackageNames>${pkg}.hadoop.*:${pkg}.impl.mr.*:${pkg}.impl.mem.*:${pkg}.io.*:${pkg}.materialize:${pkg}.scrunch</excludePackageNames>
-          <groups>
-            <group>
-              <title>Core</title>
-              <packages>${pkg}:${pkg}.fn:${pkg}.impl.*:${pkg}.io:${pkg}.types:${pkg}.types.*:${pkg}.test:${pkg}.util</packages>
-            </group>
-            <group>
-              <title>Extension Library</title>
-              <packages>${pkg}.lib:${pkg}.lib.*</packages>
-            </group>
-            <group>
-              <title>User-contributed Functionality</title>
-              <packages>${pkg}.contrib:${pkg}.contrib.*</packages>
-            </group>
-            <group>
-              <title>Examples</title>
-              <packages>${pkg}.examples</packages>
-            </group>
-          </groups>
-        </configuration>
-        <executions>
-          <execution>
-            <id>aggregate</id>
-            <goals>
-              <goal>aggregate</goal>
-            </goals>
-            <phase>site</phase>
-          </execution>
-        </executions>
+        <artifactId>maven-checkstyle-plugin</artifactId>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>
-        <version>2.4.2</version>
+        <version>2.5.2</version>
         <dependencies>
           <dependency>
             <groupId>org.apache.maven.scm</groupId>
@@ -629,7 +565,7 @@ under the License.
         <plugin>
           <groupId>org.apache.rat</groupId>
           <artifactId>apache-rat-plugin</artifactId>
-          <version>0.8</version>
+          <version>0.11</version>
           <configuration>
             <excludes>
             <exclude>.git/**</exclude>
@@ -655,11 +591,42 @@ under the License.
               </goals>
             </execution>
           </executions>
+          <!-- workaround for Xerces warnings -->
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.maven.doxia</groupId>
+              <artifactId>doxia-core</artifactId>
+              <version>1.6</version>
+              <exclusions>
+                <exclusion>
+                  <groupId>xerces</groupId>
+                  <artifactId>xercesImpl</artifactId>
+                </exclusion>
+              </exclusions>
+            </dependency>
+          </dependencies>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-checkstyle-plugin</artifactId>
+          <version>2.15</version>
+          <configuration>
+            <configLocation>src/main/config/checkstyle.xml</configLocation>
+          </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-compiler-plugin</artifactId>
-          <version>2.5.1</version>
+          <version>3.3</version>
           <configuration>
             <source>${java.source.version}</source>
             <target>${java.target.version}</target>
@@ -667,22 +634,58 @@ under the License.
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>2.10.3</version>
+          <configuration>
+            <show>public</show>
+            <nohelp>true</nohelp>
+            <excludePackageNames>${pkg}.hadoop.*:${pkg}.impl.mr.*:${pkg}.impl.mem.*:${pkg}.io.*:${pkg}.materialize:${pkg}.scrunch</excludePackageNames>
+            <groups>
+              <group>
+                <title>Core</title>
+                <packages>${pkg}:${pkg}.fn:${pkg}.impl.*:${pkg}.io:${pkg}.types:${pkg}.types.*:${pkg}.test:${pkg}.util</packages>
+              </group>
+              <group>
+                <title>Extension Library</title>
+                <packages>${pkg}.lib:${pkg}.lib.*</packages>
+              </group>
+              <group>
+                <title>User-contributed Functionality</title>
+                <packages>${pkg}.contrib:${pkg}.contrib.*</packages>
+              </group>
+              <group>
+                <title>Examples</title>
+                <packages>${pkg}.examples</packages>
+              </group>
+            </groups>
+            <!-- Prevents stricter javadoc 8 from failing the build for now -->
+            <additionalparam>-Xdoclint:none</additionalparam>
+          </configuration>
+          <executions>
+            <execution>
+              <id>aggregate</id>
+              <goals>
+                <goal>aggregate</goal>
+              </goals>
+              <phase>site</phase>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
-          <version>2.4</version>
+          <version>2.5.4</version>
         </plugin>
         <plugin>
           <groupId>net.alchim31.maven</groupId>
           <artifactId>scala-maven-plugin</artifactId>
-          <version>3.1.6</version>
+          <version>3.2.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.12</version>
+          <version>2.18.1</version>
           <configuration>
-            <encoding>UTF-8</encoding>
-            <inputEncoding>UTF-8</inputEncoding>
-            <outputEncoding>UTF-8</outputEncoding>
             <argLine>-Xmx2G -XX:PermSize=512m -XX:MaxPermSize=1G -Dfile.encoding=UTF-8</argLine>
           </configuration>
         </plugin>
@@ -694,12 +697,12 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>2.8</version>
+          <version>2.10</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-source-plugin</artifactId>
-          <version>2.1.2</version>
+          <version>2.4</version>
           <executions>
             <execution>
               <id>attach-sources</id>
@@ -713,6 +716,7 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-archetype-plugin</artifactId>
+          <!-- 2.3 seems to have a bug: "clean test" goals read as invalid "clean test\n"
-->
           <version>2.2</version>
           <extensions>true</extensions>
         </plugin>
@@ -769,61 +773,6 @@ under the License.
             </lifecycleMappingMetadata>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-site-plugin</artifactId>
-          <version>3.3</version>
-          <dependencies>
-            <dependency>
-              <groupId>org.apache.maven.wagon</groupId>
-              <artifactId>wagon-ssh</artifactId>
-              <version>1.0</version>
-            </dependency>
-            <dependency>
-              <groupId>org.apache.maven.doxia</groupId>
-              <artifactId>doxia-module-markdown</artifactId>
-              <version>1.3</version>
-            </dependency>
-          </dependencies>
-          <configuration>
-            <inputEncoding>UTF-8</inputEncoding>
-            <outputEncoding>UTF-8</outputEncoding>
-            <reportPlugins>
-              <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>cobertura-maven-plugin</artifactId>
-                <version>2.5.1</version>
-              </plugin>
-              <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.9.1</version>
-                <configuration>
-                  <configLocation>${project.parent.basedir}/src/main/config/checkstyle.xml</configLocation>
-                </configuration>   
-              </plugin>
-              <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8.1</version> 
-                <configuration>
-                  <show>protected</show> 
-                  <nohelp>true</nohelp>
-                  <subpackages>org.apache.crunch;org.apache.crunch.fn</subpackages>
-                  <excludePackageNames>org.apache.crunch.impl.*</excludePackageNames>
-                </configuration>         
-                <reportSets>
-                  <reportSet>
-                    <id>generate-javadoc</id>
-                    <reports>
-                      <report>aggregate</report>
-                    </reports>
-                  </reportSet>
-                </reportSets>
-              </plugin>
-            </reportPlugins>
-          </configuration>
-        </plugin>
       <!-- We put slow-running tests into src/it and run them during the
            integration-test phase using the failsafe plugin. This way
            developers can run unit tests conveniently from the IDE or via
@@ -832,7 +781,7 @@ under the License.
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
-        <version>1.7</version>
+        <version>1.9.1</version>
         <executions>
           <execution>
             <id>add-source</id>
@@ -877,11 +826,8 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.12</version>
+        <version>2.18.1</version>
         <configuration>
-          <encoding>UTF-8</encoding>
-          <inputEncoding>UTF-8</inputEncoding>
-          <outputEncoding>UTF-8</outputEncoding>
           <argLine>-Xmx1G -Dfile.encoding=UTF-8</argLine>
           <testSourceDirectory>${basedir}/src/it/java</testSourceDirectory>
         </configuration>

http://git-wip-us.apache.org/repos/asf/crunch/blob/e90cf278/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
deleted file mode 100644
index 09e5094..0000000
--- a/src/site/site.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?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 name="${project.name}"
-  xmlns="http://maven.apache.org/DECORATION/1.3.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0
-                      http://maven.apache.org/xsd/decoration-1.3.0.xsd">
-
-  <skin>
-    <groupId>org.apache.maven.skins</groupId>
-    <artifactId>maven-fluido-skin</artifactId>
-    <version>1.2.2</version>
-  </skin>
-
-  <bannerLeft>
-    <name></name> <!-- Leave this empty until we have a logo -->
-  </bannerLeft>
-
-  <bannerRight>
-    <src>http://apache.org/images/feather-small.gif</src>
-    <href>http://apache.org/</href>
-  </bannerRight>
-
-  <publishDate position="right"/>
-  <version position="right"/>
-
-  <body>
-    <!-- Note: Breadcrumbs for Doxia's Markdown parser are currently broken,
-               see https://jira.codehaus.org/browse/DOXIA-472 -->
-    <breadcrumbs>
-      <item name="Apache" href="http://apache.org/" />
-    </breadcrumbs>
-
-    <menu name="Apache Crunch" inherit="top">
-      <item name="About" href="index.html" />
-      <item name="API" href="apidocs/" />
-      <item name="Mailing Lists" href="mail-lists.html" />
-      <item name="Source Code" href="source-repository.html" />
-      <item name="Issue Tracking" href="issue-tracking.html" />
-      <item name="License" href="license.html" />
-      <item name="Wiki" href="https://cwiki.apache.org/confluence/display/CRUNCH/" />
-    </menu>
-    
-    <!--
-    <menu ref="modules" />
-    <menu ref="reports" inherit="bottom" />
-    -->
-  </body>
-
-</project>


Mime
View raw message