You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by bi...@apache.org on 2012/03/14 01:08:35 UTC
svn commit: r1300423 - in /incubator/accumulo/trunk: pom.xml src/ src/site/
src/site/site.xml
Author: bimargulies
Date: Wed Mar 14 00:08:34 2012
New Revision: 1300423
URL: http://svn.apache.org/viewvc?rev=1300423&view=rev
Log:
ACCUMULO-457: first pass at making the site plugin work. The modules aren't getting reports yet.
Added:
incubator/accumulo/trunk/src/
incubator/accumulo/trunk/src/site/
incubator/accumulo/trunk/src/site/site.xml (with props)
Modified:
incubator/accumulo/trunk/pom.xml
Modified: incubator/accumulo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/pom.xml?rev=1300423&r1=1300422&r2=1300423&view=diff
==============================================================================
--- incubator/accumulo/trunk/pom.xml (original)
+++ incubator/accumulo/trunk/pom.xml Wed Mar 14 00:08:34 2012
@@ -28,6 +28,22 @@
<packaging>pom</packaging>
<version>1.5.0-incubating-SNAPSHOT</version>
<name>accumulo</name>
+ <prerequisites>
+ <maven>2.2.0</maven>
+ </prerequisites>
+
+ <organization>
+ <name>Apache Accumulo Project</name>
+ <url>http://incubator.apache.org/accumulo/</url>
+ </organization>
+
+ <distributionManagement>
+ <site>
+ <id>accumulo.mvn.website</id>
+ <name>Accumulo Maven Site</name>
+ <url>scp://people.apache.org/x1/home/bimargulies/public_html/accumulo-site-stage</url>
+ </site>
+ </distributionManagement>
<modules>
<module>trace</module>
@@ -39,7 +55,14 @@
</modules>
<build>
-
+ <extensions>
+ <!-- enable ssh deployment of site with maven 3 -->
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh</artifactId>
+ <version>2.2</version>
+ </extension>
+ </extensions>
<defaultGoal>package</defaultGoal>
<plugins>
<plugin>
@@ -92,7 +115,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.3</version>
<executions>
<execution>
<id>copy-dependencies</id>
@@ -110,6 +132,7 @@
</executions>
</plugin>
<plugin>
+ <!-- set inherited=false? -->
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<outputDirectory>../lib</outputDirectory>
@@ -199,6 +222,27 @@
<pluginManagement>
<plugins>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.12</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0.1</version>
+ </plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2.1</version>
@@ -206,8 +250,13 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.2</version>
+ <version>1.2.1</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
@@ -276,6 +325,11 @@
<artifactId>rpm-maven-plugin</artifactId>
<version>2.1-alpha-1</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.0</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -311,7 +365,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.0.1</version>
+ <version>2.4.0</version>
<configuration>
<findbugsXmlOutput>true</findbugsXmlOutput>
<findbugsXmlWithMessages>true</findbugsXmlWithMessages>
@@ -323,11 +377,31 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.5</version>
+ <version>2.8.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>summary</report>
+ <report>index</report>
+ <report>dependencies</report>
+ <report>issue-tracking</report>
+ <report>scm</report>
+ </reports>
+ </reportSet>
+ </reportSets>
</plugin>
</plugins>
</reporting>
+
<profiles>
<profile>
<id>release</id>
@@ -548,7 +622,8 @@
<url>https://builds.apache.org/view/A-F/view/Accumulo/</url>
<system>Apache Jenkins</system>
</ciManagement>
- <url>http://incubator.apache.org/accumulo/</url>
+ <!-- this URL is where the site derived via the maven-site-plugin ends up, not the generic site -->
+ <url>http://incubator.apache.org/accumulo/maven/</url>
<description>Apache Accumulo is a sorted, distributed key/value store based on Google's BigTable design. It is built on top of Apache Hadoop, Zookeeper, and Thrift. It features a few novel improvements on the BigTable design in the form of cell-level access labels and a server-side programming mechanism that can modify key/value pairs at various points in the data management process.</description>
Added: incubator/accumulo/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/site/site.xml?rev=1300423&view=auto
==============================================================================
--- incubator/accumulo/trunk/src/site/site.xml (added)
+++ incubator/accumulo/trunk/src/site/site.xml Wed Mar 14 00:08:34 2012
@@ -0,0 +1,45 @@
+<?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/DECORATION/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd"
+ name="Maven">
+ <bannerLeft>
+ <name>Apache Accumulo</name>
+ <src>http://www.apache.org/images/asf-logo.gif</src>
+ <href>http://incubator.apache.org/accumulo/</href>
+ </bannerLeft>
+ <version position="right" />
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.1</version>
+ </skin>
+ <body>
+ <breadcrumbs>
+ <item name="Accumulo" href="http://incubator.apache.org/accumulo/" />
+ </breadcrumbs>
+ <menu ref="reports" />
+ <menu ref="modules" />
+ </body>
+</project>
\ No newline at end of file
Propchange: incubator/accumulo/trunk/src/site/site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/src/site/site.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain