Author: ctubbsii
Date: Mon Jun 3 19:52:38 2013
New Revision: 1489133
URL: http://svn.apache.org/r1489133
Log:
ACCUMULO-935 Enabled creating an external directory for outputting build
artifacts, so that the workspace doesn't get dirtied with unversioned files,
whose exceptions in svn:ignore, .gitignore, rpm profile, deb profile, and
tarball profiles, are becoming unwieldy to maintain and keep consistent, and
which are interfering with things like the source assembly and the rat check
plugins.
To use, add desired output directory on the command line with something like:
-DDEV_ACCUMULO_HOME=/var/tmp/ACCUMULO_HOME (or define in a profile in your
settings.xml file to be turned on by default)
ACCUMULO-1029, ACCUMULO-1431 Remove unnecessary ignored items from svn and git
- some stuff may still need to be modified in ACCUMULO-935 so that it doesn't
need to be re-added to the ignore (eg. modify script to read out of target/ or
from DEV_ACCUMULO_HOME property, etc.)
ACCUMULO-1270 Require rat checks on every build; nothing should be dirty and
need extra ignoring anymore
Added:
accumulo/trunk/docs/pom.xml
Removed:
accumulo/trunk/lib/
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/.gitignore
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/assemble/build.sh
accumulo/trunk/assemble/pom.xml
accumulo/trunk/conf/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/docs/ (props changed)
accumulo/trunk/docs/src/main/latex/accumulo_user_manual/ (props changed)
accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/ (props
changed)
accumulo/trunk/examples/ (props changed)
accumulo/trunk/examples/pom.xml
accumulo/trunk/examples/simple/ (props changed)
accumulo/trunk/fate/ (props changed)
accumulo/trunk/minicluster/ (props changed)
accumulo/trunk/pom.xml
accumulo/trunk/proxy/ (props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/server/src/main/c++/nativeMap/ (props changed)
accumulo/trunk/start/ (props changed)
accumulo/trunk/test/ (props changed)
accumulo/trunk/test/system/auto/ (props changed)
accumulo/trunk/test/system/continuous/ (props changed)
accumulo/trunk/test/system/randomwalk/ (props changed)
accumulo/trunk/test/system/randomwalk/conf/ (props changed)
accumulo/trunk/trace/ (props changed)
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 3 19:52:38 2013
@@ -1,8 +1,3 @@
-logs
-walogs
+.*
target
-.idea
-.project
-.settings
-.pydevproject
-accumulo.iml
+accumulo-project.iml
Modified: accumulo/trunk/.gitignore
URL:
http://svn.apache.org/viewvc/accumulo/trunk/.gitignore?rev=1489133&r1=1489132&r2=1489133&view=diff
==============================================================================
--- accumulo/trunk/.gitignore (original)
+++ accumulo/trunk/.gitignore Mon Jun 3 19:52:38 2013
@@ -13,64 +13,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# global Eclipse, Maven, Python
+# global IDE, Maven, Python, ignores
target/
.project
.classpath
.settings
.pydevproject
*.pyc
-
-# JetBrains IDE
.idea
*.iml
-
-# /
-/logs
-/walogs
-
-# /conf/
-/conf/accumulo-metrics.xml
-/conf/masters
-/conf/slaves
-/conf/tracers
-/conf/test-*
-/conf/gc
-/conf/monitor
-/conf/accumulo-env.sh
-/conf/accumulo-site.xml
-/conf/accumulo_user_manual.pdf
-
-# /contrib/accumulo_sample/ingest/
-/contrib/accumulo_sample/ingest/lib
-
-# /contrib/accumulo_sample/query/
-/contrib/accumulo_sample/query/lib
-
-# /docs/
-/docs/config.html
-/docs/accumulo_user_manual.pdf
-
-# /docs/src/user_manual/
-/docs/src/user_manual/accumulo_user_manual.toc
-/docs/src/user_manual/accumulo_user_manual.out
-
-# /lib/
-/lib/native
-/lib/*.jar
-
-# /server/src/main/c++/mlock/
-/server/src/main/c++/mlock/*.jnilib
-/server/src/main/c++/mlock/org_apache_accumulo_server_tabletserver_MLock.h
-
-# /server/src/main/c++/nativeMap/
-/server/src/main/c++/nativeMap/*.jnilib
-
-# /test/system/auto/
-/test/system/auto/fake_disk_failure.so
-
-# /test/system/continuous/
-/test/system/continuous/continuous-env.sh
-/test/system/continuous/walkers.txt
-/test/system/continuous/ingesters.txt
-
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 3 19:52:38 2013
@@ -1,4 +1,3 @@
+.*
target
-.settings
-.project
-accumulo-assemble.iml
+accumulo.iml
Modified: accumulo/trunk/assemble/build.sh
URL:
http://svn.apache.org/viewvc/accumulo/trunk/assemble/build.sh?rev=1489133&r1=1489132&r2=1489133&view=diff
==============================================================================
--- accumulo/trunk/assemble/build.sh (original)
+++ accumulo/trunk/assemble/build.sh Mon Jun 3 19:52:38 2013
@@ -69,12 +69,12 @@ elif [[ $1 = '--seal-jars' ]]; then
cacheGPG; setupRPM
# build a tag, but with sealed jars
run mvn clean compile javadoc:aggregate install \
- -P
apache-release,seal-jars,check-licenses,thrift,native,assemble,docs,rpm,deb
+ -P apache-release,seal-jars,thrift,native,assemble,docs,rpm,deb
elif [[ $1 = '--test' ]]; then
cacheGPG; setupRPM
# build a tag, but with tests
run mvn clean compile javadoc:aggregate install \
- -P apache-release,check-licenses,thrift,native,assemble,docs,rpm,deb
+ -P apache-release,thrift,native,assemble,docs,rpm,deb
else
fail "Missing one of: --create-release-candidate, --test, --seal-jars"
fi
Modified: accumulo/trunk/assemble/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/assemble/pom.xml?rev=1489133&r1=1489132&r2=1489133&view=diff
==============================================================================
--- accumulo/trunk/assemble/pom.xml (original)
+++ accumulo/trunk/assemble/pom.xml Mon Jun 3 19:52:38 2013
@@ -84,31 +84,6 @@
<scope>provided</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>config-webpage</id>
- <goals>
- <goal>java</goal>
- </goals>
- <phase>prepare-package</phase>
- <configuration>
-
<mainClass>org.apache.accumulo.core.conf.DefaultConfiguration</mainClass>
- <classpathScope>compile</classpathScope>
- <arguments>
- <argument>--generate-doc</argument>
-
<argument>${project.build.directory}/../../docs/config.html</argument>
- </arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
<profiles>
<profile>
<id>apache-release</id>
@@ -634,52 +609,5 @@
</plugins>
</build>
</profile>
- <profile>
- <id>docs</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-pdf-manuals</id>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <phase>prepare-package</phase>
- <configuration>
- <outputDirectory>../docs</outputDirectory>
- <resources>
- <resource>
- <directory>${project.build.directory}</directory>
- <includes>
- <include>*.pdf</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>latex-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>build-pdf-manuals</id>
- <goals>
- <goal>latex</goal>
- </goals>
- <phase>compile</phase>
- <configuration>
- <docsRoot>../docs/src/main/latex</docsRoot>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
Propchange: accumulo/trunk/conf/
('svn:ignore' removed)
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 3 19:52:38 2013
@@ -1,5 +1,3 @@
+.*
target
-.settings
-.project
-.classpath
accumulo-core.iml
Propchange: accumulo/trunk/docs/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 3 19:52:38 2013
@@ -1,4 +1,3 @@
-config.html
-accumulo_developer_manual.pdf
-accumulo_user_manual.pdf
-apidocs
+.*
+target
+accumulo-docs.iml
Added: accumulo/trunk/docs/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/docs/pom.xml?rev=1489133&view=auto
==============================================================================
--- accumulo/trunk/docs/pom.xml (added)
+++ accumulo/trunk/docs/pom.xml Mon Jun 3 19:52:38 2013
@@ -0,0 +1,92 @@
+<?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>org.apache.accumulo</groupId>
+ <artifactId>accumulo-project</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>accumulo-docs</artifactId>
+ <packaging>pom</packaging>
+ <name>Documentation</name>
+ <dependencies>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <profiles>
+ <profile>
+ <id>docs</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>config-webpage</id>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <phase>prepare-package</phase>
+ <configuration>
+
<mainClass>org.apache.accumulo.core.conf.DefaultConfiguration</mainClass>
+ <classpathScope>test</classpathScope>
+ <arguments>
+ <argument>--generate-doc</argument>
+ <argument>${project.build.directory}/config.html</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>latex-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>build-pdf-manuals</id>
+ <goals>
+ <goal>latex</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
Propchange: accumulo/trunk/docs/src/main/latex/accumulo_user_manual/
('svn:ignore' removed)
Propchange: accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/
('svn:ignore' removed)
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 3 19:52:38 2013
@@ -1,5 +1,3 @@
+.*
target
-.settings
-.classpath
-.project
accumulo-examples.iml
Modified: accumulo/trunk/examples/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/examples/pom.xml?rev=1489133&r1=1489132&r2=1489133&view=diff
==============================================================================
--- accumulo/trunk/examples/pom.xml (original)
+++ accumulo/trunk/examples/pom.xml Mon Jun 3 19:52:38 2013
@@ -28,29 +28,4 @@
<modules>
<module>simple</module>
</modules>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <phase>prepare-package</phase>
- <configuration>
- <outputDirectory>../../lib</outputDirectory>
- <!-- just grab the non-provided runtime dependencies -->
- <stripVersion>true</stripVersion>
- <includeScope>runtime</includeScope>
- <excludeTransitive>true</excludeTransitive>
- <excludeClassifiers>sources,test-sources</excludeClassifiers>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
Propchange: accumulo/trunk/examples/simple/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 3 19:52:38 2013
@@ -1,3 +1,3 @@
.*
target
-examples-simple.iml
+accumulo-examples-simple.iml
Propchange: accumulo/trunk/fate/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 3 19:52:38 2013
@@ -1,5 +1,3 @@
-.settings
-.classpath
-.project
+.*
target
accumulo-fate.iml
Propchange: accumulo/trunk/minicluster/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 3 19:52:38 2013
@@ -1,5 +1,3 @@
+.*
target
-.project
-.settings
-.classpath
accumulo-minicluster.iml
Modified: accumulo/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/pom.xml?rev=1489133&r1=1489132&r2=1489133&view=diff
==============================================================================
--- accumulo/trunk/pom.xml (original)
+++ accumulo/trunk/pom.xml Mon Jun 3 19:52:38 2013
@@ -82,6 +82,7 @@
<module>proxy</module>
<module>test</module>
<module>minicluster</module>
+ <module>docs</module>
</modules>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/accumulo/trunk</connection>
@@ -389,24 +390,10 @@
<configuration>
<filesets>
<fileset>
- <directory>lib</directory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileset>
- <fileset>
- <directory>docs/apidocs</directory>
- </fileset>
- <fileset>
- <directory>test</directory>
- <includes>
- <include>**/*.so</include>
- </includes>
- </fileset>
- <fileset>
<directory>./</directory>
<includes>
<include>**/*.pyc</include>
+ <include>**/*.so</include>
</includes>
</fileset>
</filesets>
@@ -453,7 +440,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
- <arguments>-P
apache-release,check-licenses,thrift,native,assemble,docs,rpm,deb</arguments>
+ <arguments>-P
apache-release,thrift,native,assemble,docs,rpm,deb</arguments>
<autoVersionSubmodules>true</autoVersionSubmodules>
<goals>clean compile javadoc:aggregate deploy</goals>
<preparationGoals>clean compile javadoc:aggregate
verify</preparationGoals>
@@ -476,20 +463,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>docs/apidocs/package-list</exclude>
- <exclude>conf/slaves</exclude>
- <exclude>conf/masters</exclude>
- <exclude>conf/gc</exclude>
- <exclude>conf/tracers</exclude>
- <exclude>conf/monitor</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.8</version>
@@ -620,27 +593,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <phase>prepare-package</phase>
- <configuration>
- <outputDirectory>../lib</outputDirectory>
- <!-- just grab the non-provided runtime dependencies -->
- <stripVersion>true</stripVersion>
- <includeScope>runtime</includeScope>
- <excludeTransitive>true</excludeTransitive>
- <excludeClassifiers>sources,test-sources</excludeClassifiers>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
@@ -691,6 +643,18 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <phase>verify</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<extensions>
<extension>
@@ -777,6 +741,75 @@
</reporting>
<profiles>
<profile>
+ <id>make-accumulo-home</id>
+ <activation>
+ <property>
+ <name>DEV_ACCUMULO_HOME</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <phase>prepare-package</phase>
+ <configuration>
+ <outputDirectory>${DEV_ACCUMULO_HOME}/lib</outputDirectory>
+ <!-- just grab the non-provided runtime dependencies -->
+ <stripVersion>true</stripVersion>
+ <includeScope>runtime</includeScope>
+ <excludeTransitive>true</excludeTransitive>
+ <excludeClassifiers>sources,test-sources</excludeClassifiers>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-scripts</id>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <phase>process-resources</phase>
+ <configuration>
+ <outputDirectory>${DEV_ACCUMULO_HOME}/bin</outputDirectory>
+ <resources>
+ <resource>
+ <directory>bin</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-configuration</id>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <phase>process-resources</phase>
+ <configuration>
+ <outputDirectory>${DEV_ACCUMULO_HOME}/conf</outputDirectory>
+ <resources>
+ <resource>
+ <directory>conf</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<id>apache-release</id>
<build>
<plugins>
@@ -864,27 +897,6 @@
</properties>
</profile>
<profile>
- <!-- Automatically check for licenses.
- Activate with -P check-licenses -->
- <id>check-licenses</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>verify</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<!-- Generate cobertura reports with site.
Activate with -P cobertura -->
<id>cobertura</id>
Propchange: accumulo/trunk/proxy/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 3 19:52:38 2013
@@ -1,4 +1,3 @@
-.classpath
-.project
+.*
target
-.settings
+accumulo-proxy.iml
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 3 19:52:38 2013
@@ -1,5 +1,3 @@
+.*
target
-.project
-.settings
-.classpath
accumulo-server.iml
Propchange: accumulo/trunk/server/src/main/c++/nativeMap/
('svn:ignore' removed)
Propchange: accumulo/trunk/start/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 3 19:52:38 2013
@@ -1,5 +1,3 @@
+.*
target
-.classpath
-.project
-.settings
accumulo-start.iml
Propchange: accumulo/trunk/test/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 3 19:52:38 2013
@@ -1,5 +1,3 @@
+.*
target
-.classpath
-.project
-.settings
accumulo-test.iml
Propchange: accumulo/trunk/test/system/auto/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 3 19:52:38 2013
@@ -1,2 +1 @@
*.pyc
-fake_disk_failure.so
Propchange: accumulo/trunk/test/system/continuous/
('svn:ignore' removed)
Propchange: accumulo/trunk/test/system/randomwalk/
('svn:ignore' removed)
Propchange: accumulo/trunk/test/system/randomwalk/conf/
('svn:ignore' removed)
Propchange: accumulo/trunk/trace/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 3 19:52:38 2013
@@ -1,5 +1,3 @@
+.*
target
-.classpath
-.project
-.settings
-cloudtrace.iml
+accumulo-trace.iml
