You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2016/07/22 23:39:52 UTC
[1/6] accumulo git commit: ACCUMULO-4390 Remove unnecessary build
profiles
Repository: accumulo
Updated Branches:
refs/heads/1.7 cfebe5618 -> 9ad71110d
refs/heads/1.8 1bba1eec5 -> 6cc07fa63
refs/heads/master 2c550740e -> 976854c6a
ACCUMULO-4390 Remove unnecessary build profiles
* Remove docs and assemble profiles (always run their tasks)
* Trigger attaching src.tar.gz when created with apache-release profile
* Remove unused vestigial shared-mini-for-it profile
* Ensure dependencies for non-jars are optional, so they don't get
included transitively
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9ad71110
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9ad71110
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9ad71110
Branch: refs/heads/1.7
Commit: 9ad71110d0382b23962d9305096add2d380afd25
Parents: cfebe56
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Jul 22 18:29:27 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Jul 22 18:43:03 2016 -0400
----------------------------------------------------------------------
README.md | 10 +-
assemble/build.sh | 2 +-
assemble/pom.xml | 151 ++++++++++++++-------------
docs/pom.xml | 248 ++++++++++++++++++++++-----------------------
pom.xml | 2 +-
server/native/pom.xml | 1 +
test/pom.xml | 55 ----------
7 files changed, 207 insertions(+), 262 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ad71110/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index a62df38..f3d7bca 100644
--- a/README.md
+++ b/README.md
@@ -60,16 +60,14 @@ Building
Accumulo uses [Maven][9] to compile, [test][3], and package its source. The
following command will build the binary tar.gz from source. Note, these
instructions will not work for the Accumulo binary distribution as it does not
-include source.
+include source. If you just want to build without waiting for the tests to
+run, add `-DskipTests`.
- mvn package -P assemble
+ mvn package
This command produces a file at the following location.
- assemble/target/accumulo-X.Y.Z-SNAPSHOT-bin.tar.gz
-
-This will not include documentation, adding the `-P docs` option to the maven
-command will build documentation.
+ assemble/target/accumulo-<version>-bin.tar.gz
API
---
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ad71110/assemble/build.sh
----------------------------------------------------------------------
diff --git a/assemble/build.sh b/assemble/build.sh
index 9bc0beb..c04bff7 100755
--- a/assemble/build.sh
+++ b/assemble/build.sh
@@ -277,7 +277,7 @@ if [[ $1 == '--create-release-candidate' ]]; then
elif [[ $1 == '--test' ]]; then
cacheGPG
# build a tag, but with tests
- runOrFail mvn clean install -P apache-release,thrift,assemble,docs,accumulo-release
+ runOrFail mvn clean install -P apache-release,accumulo-release,thrift
elif [[ $1 == '--create-email' ]]; then
shift
createEmail "$@"
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ad71110/assemble/pom.xml
----------------------------------------------------------------------
diff --git a/assemble/pom.xml b/assemble/pom.xml
index 58016ef..4bb937c 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -34,139 +34,180 @@
<dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-docs</artifactId>
+ <classifier>user-manual</classifier>
+ <type>html</type>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-examples-simple</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-fate</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-gc</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-master</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-minicluster</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-monitor</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-native</artifactId>
<type>tar.gz</type>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-proxy</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-server-base</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-shell</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-start</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-test</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-trace</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-tracer</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-tserver</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-vfs2</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
+ <optional>true</optional>
</dependency>
</dependencies>
<build>
@@ -219,11 +260,47 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>directory-assembly</id>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <finalName>${project.build.finalName}</finalName>
+ <outputDirectory>${DEV_ACCUMULO_HOME}</outputDirectory>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <descriptors>
+ <descriptor>src/main/assemblies/dev-directory.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ <execution>
+ <id>binary-assembly</id>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assemblies/binary-release.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<profiles>
<profile>
- <id>accumulo-release</id>
+ <!-- attach source release when it is created by the apache-release profile -->
+ <id>apache-release</id>
<build>
<plugins>
<plugin>
@@ -250,77 +327,5 @@
</plugins>
</build>
</profile>
- <profile>
- <id>assemble</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>binary-assembly</id>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>src/main/assemblies/binary-release.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>make-accumulo-home</id>
- <activation>
- <!-- always activate, unless explicitly de-activated -->
- <file>
- <exists>pom.xml</exists>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>directory-assembly</id>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <finalName>${project.build.finalName}</finalName>
- <outputDirectory>${DEV_ACCUMULO_HOME}</outputDirectory>
- <formats>
- <format>dir</format>
- </formats>
- <descriptors>
- <descriptor>src/main/assemblies/dev-directory.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>docs</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-docs</artifactId>
- <classifier>user-manual</classifier>
- <type>html</type>
- </dependency>
- </dependencies>
- </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ad71110/docs/pom.xml
----------------------------------------------------------------------
diff --git a/docs/pom.xml b/docs/pom.xml
index b470081..9c5a333 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -26,132 +26,128 @@
<packaging>pom</packaging>
<name>Apache Accumulo Documentation</name>
<description>User documentation for Apache Accumulo.</description>
- <profiles>
- <profile>
- <id>docs</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-core</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-asciidoc</id>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <phase>compile</phase>
- <configuration>
- <outputDirectory>${project.build.directory}/asciidoc</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/asciidoc</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctor-maven-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-core</artifactId>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-asciidoc</id>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <phase>compile</phase>
<configuration>
- <backend>html</backend>
- <doctype>book</doctype>
- <embedAssets>true</embedAssets>
- <imagesDir>${project.build.directory}/asciidoc/images</imagesDir>
- <sourceDirectory>${project.build.directory}/asciidoc</sourceDirectory>
- <sourceHighlighter>highlightjs</sourceHighlighter>
+ <outputDirectory>${project.build.directory}/asciidoc</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/asciidoc</directory>
+ </resource>
+ </resources>
</configuration>
- <executions>
- <execution>
- <id>output-html</id>
- <goals>
- <goal>process-asciidoc</goal>
- </goals>
- <phase>prepare-package</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>prep-output-dir</id>
- <goals>
- <goal>exec</goal>
- </goals>
- <phase>compile</phase>
- <configuration>
- <executable>mkdir</executable>
- <arguments>
- <argument>-p</argument>
- <argument>${project.build.directory}/asciidoc/appendices</argument>
- </arguments>
- </configuration>
- </execution>
- <execution>
- <id>config-html</id>
- <goals>
- <goal>java</goal>
- </goals>
- <phase>compile</phase>
- <configuration>
- <mainClass>org.apache.accumulo.core.conf.ConfigurationDocGen</mainClass>
- <classpathScope>compile</classpathScope>
- <arguments>
- <argument>--generate-html</argument>
- <argument>${project.build.directory}/config.html</argument>
- </arguments>
- </configuration>
- </execution>
- <execution>
- <id>config-appendix</id>
- <goals>
- <goal>java</goal>
- </goals>
- <phase>compile</phase>
- <configuration>
- <mainClass>org.apache.accumulo.core.conf.ConfigurationDocGen</mainClass>
- <classpathScope>compile</classpathScope>
- <arguments>
- <argument>--generate-asciidoc</argument>
- <argument>${project.build.directory}/asciidoc/appendices/config.txt</argument>
- </arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-user-manual-html</id>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>${project.build.directory}/generated-docs/accumulo_user_manual.html</file>
- <type>html</type>
- <classifier>user-manual</classifier>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.asciidoctor</groupId>
+ <artifactId>asciidoctor-maven-plugin</artifactId>
+ <configuration>
+ <backend>html</backend>
+ <doctype>book</doctype>
+ <embedAssets>true</embedAssets>
+ <imagesDir>${project.build.directory}/asciidoc/images</imagesDir>
+ <sourceDirectory>${project.build.directory}/asciidoc</sourceDirectory>
+ <sourceHighlighter>highlightjs</sourceHighlighter>
+ </configuration>
+ <executions>
+ <execution>
+ <id>output-html</id>
+ <goals>
+ <goal>process-asciidoc</goal>
+ </goals>
+ <phase>prepare-package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>prep-output-dir</id>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <phase>compile</phase>
+ <configuration>
+ <executable>mkdir</executable>
+ <arguments>
+ <argument>-p</argument>
+ <argument>${project.build.directory}/asciidoc/appendices</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ <execution>
+ <id>config-html</id>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <phase>compile</phase>
+ <configuration>
+ <mainClass>org.apache.accumulo.core.conf.ConfigurationDocGen</mainClass>
+ <classpathScope>compile</classpathScope>
+ <arguments>
+ <argument>--generate-html</argument>
+ <argument>${project.build.directory}/config.html</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ <execution>
+ <id>config-appendix</id>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <phase>compile</phase>
+ <configuration>
+ <mainClass>org.apache.accumulo.core.conf.ConfigurationDocGen</mainClass>
+ <classpathScope>compile</classpathScope>
+ <arguments>
+ <argument>--generate-asciidoc</argument>
+ <argument>${project.build.directory}/asciidoc/appendices/config.txt</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-user-manual-html</id>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>${project.build.directory}/generated-docs/accumulo_user_manual.html</file>
+ <type>html</type>
+ <classifier>user-manual</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ad71110/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5f7caae..b9b2168 100644
--- a/pom.xml
+++ b/pom.xml
@@ -659,7 +659,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
- <arguments>-P !autoformat,thrift,assemble,docs,sunny -Dtimeout.factor=2 ${extraReleaseArgs}</arguments>
+ <arguments>-P !autoformat,thrift,sunny -Dtimeout.factor=2 ${extraReleaseArgs}</arguments>
<autoVersionSubmodules>true</autoVersionSubmodules>
<goals>clean deploy</goals>
<preparationGoals>clean verify</preparationGoals>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ad71110/server/native/pom.xml
----------------------------------------------------------------------
diff --git a/server/native/pom.xml b/server/native/pom.xml
index 34c2bcf..b984110 100644
--- a/server/native/pom.xml
+++ b/server/native/pom.xml
@@ -34,6 +34,7 @@
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-tserver</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ad71110/test/pom.xml
----------------------------------------------------------------------
diff --git a/test/pom.xml b/test/pom.xml
index 4c73f89..a78ba7e 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -235,61 +235,6 @@
</build>
<profiles>
<profile>
- <id>shared-mini-for-it</id>
- <!--
- <activation>
- <property>
- <name>!skipITs</name>
- </property>
- </activation>
- -->
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>setup-mini-classpath</id>
- <goals>
- <goal>build-classpath</goal>
- </goals>
- <phase>pre-integration-test</phase>
- <configuration>
- <includeScope>test</includeScope>
- <outputProperty>accumulo-it-mini-classpath</outputProperty>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>run-mini-for-integration-tests</id>
- <goals>
- <goal>java</goal>
- </goals>
- <phase>pre-integration-test</phase>
- <configuration>
- <mainClass>org.apache.accumulo.maven.plugin.StartMojo</mainClass>
- <classpathScope>test</classpathScope>
- <arguments>
- <!-- These first two should stay static -->
- <argument>${project.build.directory}</argument>
- <argument>${accumulo-it-mini-classpath}</argument>
- <!-- InstanceName RootPassword, one pair per MiniAccumuloCluster -->
- <argument>testInstance1 testRootPassword1</argument>
- </arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>hadoop-default</id>
<activation>
<property>
[5/6] accumulo git commit: Merge branch '1.7' into 1.8
Posted by ct...@apache.org.
Merge branch '1.7' into 1.8
Conflicts:
assemble/pom.xml
test/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6cc07fa6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6cc07fa6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6cc07fa6
Branch: refs/heads/1.8
Commit: 6cc07fa633fdbf135e3b5d14969e6de5ff8870ef
Parents: 1bba1ee 9ad7111
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Jul 22 19:30:50 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Jul 22 19:30:50 2016 -0400
----------------------------------------------------------------------
README.md | 10 +-
assemble/build.sh | 2 +-
assemble/pom.xml | 152 ++++++++++++++-------------
docs/pom.xml | 248 ++++++++++++++++++++++-----------------------
pom.xml | 2 +-
server/native/pom.xml | 1 +
test/pom.xml | 55 ----------
7 files changed, 208 insertions(+), 262 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6cc07fa6/README.md
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6cc07fa6/assemble/pom.xml
----------------------------------------------------------------------
diff --cc assemble/pom.xml
index 1b7d054,4bb937c..9c1639a
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@@ -122,7 -151,8 +151,8 @@@
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-math</artifactId>
+ <artifactId>commons-math3</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@@ -250,93 -327,5 +327,22 @@@
</plugins>
</build>
</profile>
+ <profile>
- <id>assemble</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>binary-assembly</id>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>src/main/assemblies/binary-release.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>make-accumulo-home</id>
- <activation>
- <!-- always activate, unless explicitly de-activated -->
- <file>
- <exists>pom.xml</exists>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>directory-assembly</id>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <finalName>${project.build.finalName}</finalName>
- <outputDirectory>${DEV_ACCUMULO_HOME}</outputDirectory>
- <formats>
- <format>dir</format>
- </formats>
- <descriptors>
- <descriptor>src/main/assemblies/dev-directory.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>docs</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-docs</artifactId>
- <classifier>user-manual</classifier>
- <type>html</type>
- </dependency>
- </dependencies>
- </profile>
- <profile>
+ <!-- create shaded test jar appropriate for running ITs on MapReduce -->
+ <id>mrit</id>
+ <activation>
+ <property>
+ <name>mrit</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-test</artifactId>
+ <classifier>mrit</classifier>
++ <optional>true</optional>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6cc07fa6/docs/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6cc07fa6/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6cc07fa6/server/native/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6cc07fa6/test/pom.xml
----------------------------------------------------------------------
diff --cc test/pom.xml
index b6c392c,a78ba7e..92aeeaf
--- a/test/pom.xml
+++ b/test/pom.xml
@@@ -286,117 -235,43 +286,62 @@@
</build>
<profiles>
<profile>
- <id>shared-mini-for-it</id>
- <!--
- <id>hadoop-default</id>
-- <activation>
-- <property>
- <name>!skipITs</name>
- <name>!hadoop.profile</name>
-- </property>
-- </activation>
- -->
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>setup-mini-classpath</id>
- <goals>
- <goal>build-classpath</goal>
- </goals>
- <phase>pre-integration-test</phase>
- <configuration>
- <includeScope>test</includeScope>
- <outputProperty>accumulo-it-mini-classpath</outputProperty>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>run-mini-for-integration-tests</id>
- <goals>
- <goal>java</goal>
- </goals>
- <phase>pre-integration-test</phase>
- <configuration>
- <mainClass>org.apache.accumulo.maven.plugin.StartMojo</mainClass>
- <classpathScope>test</classpathScope>
- <arguments>
- <!-- These first two should stay static -->
- <argument>${project.build.directory}</argument>
- <argument>${accumulo-it-mini-classpath}</argument>
- <!-- InstanceName RootPassword, one pair per MiniAccumuloCluster -->
- <argument>testInstance1 testRootPassword1</argument>
- </arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <properties>
- <!-- Denotes intention and allows the enforcer plugin to pass when
- the user is relying on default behavior; won't work to activate profile -->
- <hadoop.profile>2</hadoop.profile>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-distcp</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-- </profile>
- <!-- profile for building against Hadoop 2.x
- XXX Since this is the default, make sure to sync hadoop-default when changing.
- Activate using: mvn -Dhadoop.profile=2 -->
-- <profile>
- <id>hadoop-2</id>
+ <!-- create shaded test jar appropriate for running ITs on MapReduce -->
+ <id>mrit</id>
<activation>
<property>
- <name>hadoop.profile</name>
- <value>2</value>
+ <name>mrit</name>
</property>
</activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-distcp</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <configuration>
+ <artifactSet>
+ <excludes>
+ <exclude>com.google.auto.service</exclude>
+ <exclude>com.google.auto</exclude>
+ <exclude>javax.servlet:servlet-api</exclude>
+ <exclude>org.apache.accumulo:accumulo-native</exclude>
+ <exclude>org.slf4j:slf4j-log4j12</exclude>
+ </excludes>
+ </artifactSet>
+ <shadedArtifactAttached>true</shadedArtifactAttached>
+ <shadedClassifierName>mrit</shadedClassifierName>
+ <createDependencyReducedPom>false</createDependencyReducedPom>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/DEPENDENCIES</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <manifestEntries>
+ <Sealed>false</Sealed>
+ <Main-Class>org.apache.accumulo.test.mrit.IntegrationTestMapReduce</Main-Class>
+ </manifestEntries>
+ </transformer>
+ </transformers>
+ </configuration>
+ <executions>
+ <execution>
+ <id>create-shaded-mrit</id>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</profile>
</profiles>
</project>
[2/6] accumulo git commit: ACCUMULO-4390 Remove unnecessary build
profiles
Posted by ct...@apache.org.
ACCUMULO-4390 Remove unnecessary build profiles
* Remove docs and assemble profiles (always run their tasks)
* Trigger attaching src.tar.gz when created with apache-release profile
* Remove unused vestigial shared-mini-for-it profile
* Ensure dependencies for non-jars are optional, so they don't get
included transitively
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9ad71110
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9ad71110
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9ad71110
Branch: refs/heads/1.8
Commit: 9ad71110d0382b23962d9305096add2d380afd25
Parents: cfebe56
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Jul 22 18:29:27 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Jul 22 18:43:03 2016 -0400
----------------------------------------------------------------------
README.md | 10 +-
assemble/build.sh | 2 +-
assemble/pom.xml | 151 ++++++++++++++-------------
docs/pom.xml | 248 ++++++++++++++++++++++-----------------------
pom.xml | 2 +-
server/native/pom.xml | 1 +
test/pom.xml | 55 ----------
7 files changed, 207 insertions(+), 262 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ad71110/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index a62df38..f3d7bca 100644
--- a/README.md
+++ b/README.md
@@ -60,16 +60,14 @@ Building
Accumulo uses [Maven][9] to compile, [test][3], and package its source. The
following command will build the binary tar.gz from source. Note, these
instructions will not work for the Accumulo binary distribution as it does not
-include source.
+include source. If you just want to build without waiting for the tests to
+run, add `-DskipTests`.
- mvn package -P assemble
+ mvn package
This command produces a file at the following location.
- assemble/target/accumulo-X.Y.Z-SNAPSHOT-bin.tar.gz
-
-This will not include documentation, adding the `-P docs` option to the maven
-command will build documentation.
+ assemble/target/accumulo-<version>-bin.tar.gz
API
---
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ad71110/assemble/build.sh
----------------------------------------------------------------------
diff --git a/assemble/build.sh b/assemble/build.sh
index 9bc0beb..c04bff7 100755
--- a/assemble/build.sh
+++ b/assemble/build.sh
@@ -277,7 +277,7 @@ if [[ $1 == '--create-release-candidate' ]]; then
elif [[ $1 == '--test' ]]; then
cacheGPG
# build a tag, but with tests
- runOrFail mvn clean install -P apache-release,thrift,assemble,docs,accumulo-release
+ runOrFail mvn clean install -P apache-release,accumulo-release,thrift
elif [[ $1 == '--create-email' ]]; then
shift
createEmail "$@"
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ad71110/assemble/pom.xml
----------------------------------------------------------------------
diff --git a/assemble/pom.xml b/assemble/pom.xml
index 58016ef..4bb937c 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -34,139 +34,180 @@
<dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-docs</artifactId>
+ <classifier>user-manual</classifier>
+ <type>html</type>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-examples-simple</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-fate</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-gc</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-master</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-minicluster</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-monitor</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-native</artifactId>
<type>tar.gz</type>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-proxy</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-server-base</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-shell</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-start</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-test</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-trace</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-tracer</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-tserver</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-vfs2</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
+ <optional>true</optional>
</dependency>
</dependencies>
<build>
@@ -219,11 +260,47 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>directory-assembly</id>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <finalName>${project.build.finalName}</finalName>
+ <outputDirectory>${DEV_ACCUMULO_HOME}</outputDirectory>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <descriptors>
+ <descriptor>src/main/assemblies/dev-directory.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ <execution>
+ <id>binary-assembly</id>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assemblies/binary-release.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<profiles>
<profile>
- <id>accumulo-release</id>
+ <!-- attach source release when it is created by the apache-release profile -->
+ <id>apache-release</id>
<build>
<plugins>
<plugin>
@@ -250,77 +327,5 @@
</plugins>
</build>
</profile>
- <profile>
- <id>assemble</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>binary-assembly</id>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>src/main/assemblies/binary-release.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>make-accumulo-home</id>
- <activation>
- <!-- always activate, unless explicitly de-activated -->
- <file>
- <exists>pom.xml</exists>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>directory-assembly</id>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <finalName>${project.build.finalName}</finalName>
- <outputDirectory>${DEV_ACCUMULO_HOME}</outputDirectory>
- <formats>
- <format>dir</format>
- </formats>
- <descriptors>
- <descriptor>src/main/assemblies/dev-directory.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>docs</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-docs</artifactId>
- <classifier>user-manual</classifier>
- <type>html</type>
- </dependency>
- </dependencies>
- </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ad71110/docs/pom.xml
----------------------------------------------------------------------
diff --git a/docs/pom.xml b/docs/pom.xml
index b470081..9c5a333 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -26,132 +26,128 @@
<packaging>pom</packaging>
<name>Apache Accumulo Documentation</name>
<description>User documentation for Apache Accumulo.</description>
- <profiles>
- <profile>
- <id>docs</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-core</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-asciidoc</id>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <phase>compile</phase>
- <configuration>
- <outputDirectory>${project.build.directory}/asciidoc</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/asciidoc</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctor-maven-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-core</artifactId>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-asciidoc</id>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <phase>compile</phase>
<configuration>
- <backend>html</backend>
- <doctype>book</doctype>
- <embedAssets>true</embedAssets>
- <imagesDir>${project.build.directory}/asciidoc/images</imagesDir>
- <sourceDirectory>${project.build.directory}/asciidoc</sourceDirectory>
- <sourceHighlighter>highlightjs</sourceHighlighter>
+ <outputDirectory>${project.build.directory}/asciidoc</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/asciidoc</directory>
+ </resource>
+ </resources>
</configuration>
- <executions>
- <execution>
- <id>output-html</id>
- <goals>
- <goal>process-asciidoc</goal>
- </goals>
- <phase>prepare-package</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>prep-output-dir</id>
- <goals>
- <goal>exec</goal>
- </goals>
- <phase>compile</phase>
- <configuration>
- <executable>mkdir</executable>
- <arguments>
- <argument>-p</argument>
- <argument>${project.build.directory}/asciidoc/appendices</argument>
- </arguments>
- </configuration>
- </execution>
- <execution>
- <id>config-html</id>
- <goals>
- <goal>java</goal>
- </goals>
- <phase>compile</phase>
- <configuration>
- <mainClass>org.apache.accumulo.core.conf.ConfigurationDocGen</mainClass>
- <classpathScope>compile</classpathScope>
- <arguments>
- <argument>--generate-html</argument>
- <argument>${project.build.directory}/config.html</argument>
- </arguments>
- </configuration>
- </execution>
- <execution>
- <id>config-appendix</id>
- <goals>
- <goal>java</goal>
- </goals>
- <phase>compile</phase>
- <configuration>
- <mainClass>org.apache.accumulo.core.conf.ConfigurationDocGen</mainClass>
- <classpathScope>compile</classpathScope>
- <arguments>
- <argument>--generate-asciidoc</argument>
- <argument>${project.build.directory}/asciidoc/appendices/config.txt</argument>
- </arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-user-manual-html</id>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>${project.build.directory}/generated-docs/accumulo_user_manual.html</file>
- <type>html</type>
- <classifier>user-manual</classifier>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.asciidoctor</groupId>
+ <artifactId>asciidoctor-maven-plugin</artifactId>
+ <configuration>
+ <backend>html</backend>
+ <doctype>book</doctype>
+ <embedAssets>true</embedAssets>
+ <imagesDir>${project.build.directory}/asciidoc/images</imagesDir>
+ <sourceDirectory>${project.build.directory}/asciidoc</sourceDirectory>
+ <sourceHighlighter>highlightjs</sourceHighlighter>
+ </configuration>
+ <executions>
+ <execution>
+ <id>output-html</id>
+ <goals>
+ <goal>process-asciidoc</goal>
+ </goals>
+ <phase>prepare-package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>prep-output-dir</id>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <phase>compile</phase>
+ <configuration>
+ <executable>mkdir</executable>
+ <arguments>
+ <argument>-p</argument>
+ <argument>${project.build.directory}/asciidoc/appendices</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ <execution>
+ <id>config-html</id>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <phase>compile</phase>
+ <configuration>
+ <mainClass>org.apache.accumulo.core.conf.ConfigurationDocGen</mainClass>
+ <classpathScope>compile</classpathScope>
+ <arguments>
+ <argument>--generate-html</argument>
+ <argument>${project.build.directory}/config.html</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ <execution>
+ <id>config-appendix</id>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <phase>compile</phase>
+ <configuration>
+ <mainClass>org.apache.accumulo.core.conf.ConfigurationDocGen</mainClass>
+ <classpathScope>compile</classpathScope>
+ <arguments>
+ <argument>--generate-asciidoc</argument>
+ <argument>${project.build.directory}/asciidoc/appendices/config.txt</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-user-manual-html</id>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>${project.build.directory}/generated-docs/accumulo_user_manual.html</file>
+ <type>html</type>
+ <classifier>user-manual</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ad71110/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5f7caae..b9b2168 100644
--- a/pom.xml
+++ b/pom.xml
@@ -659,7 +659,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
- <arguments>-P !autoformat,thrift,assemble,docs,sunny -Dtimeout.factor=2 ${extraReleaseArgs}</arguments>
+ <arguments>-P !autoformat,thrift,sunny -Dtimeout.factor=2 ${extraReleaseArgs}</arguments>
<autoVersionSubmodules>true</autoVersionSubmodules>
<goals>clean deploy</goals>
<preparationGoals>clean verify</preparationGoals>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ad71110/server/native/pom.xml
----------------------------------------------------------------------
diff --git a/server/native/pom.xml b/server/native/pom.xml
index 34c2bcf..b984110 100644
--- a/server/native/pom.xml
+++ b/server/native/pom.xml
@@ -34,6 +34,7 @@
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-tserver</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ad71110/test/pom.xml
----------------------------------------------------------------------
diff --git a/test/pom.xml b/test/pom.xml
index 4c73f89..a78ba7e 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -235,61 +235,6 @@
</build>
<profiles>
<profile>
- <id>shared-mini-for-it</id>
- <!--
- <activation>
- <property>
- <name>!skipITs</name>
- </property>
- </activation>
- -->
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>setup-mini-classpath</id>
- <goals>
- <goal>build-classpath</goal>
- </goals>
- <phase>pre-integration-test</phase>
- <configuration>
- <includeScope>test</includeScope>
- <outputProperty>accumulo-it-mini-classpath</outputProperty>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>run-mini-for-integration-tests</id>
- <goals>
- <goal>java</goal>
- </goals>
- <phase>pre-integration-test</phase>
- <configuration>
- <mainClass>org.apache.accumulo.maven.plugin.StartMojo</mainClass>
- <classpathScope>test</classpathScope>
- <arguments>
- <!-- These first two should stay static -->
- <argument>${project.build.directory}</argument>
- <argument>${accumulo-it-mini-classpath}</argument>
- <!-- InstanceName RootPassword, one pair per MiniAccumuloCluster -->
- <argument>testInstance1 testRootPassword1</argument>
- </arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>hadoop-default</id>
<activation>
<property>
[4/6] accumulo git commit: Merge branch '1.7' into 1.8
Posted by ct...@apache.org.
Merge branch '1.7' into 1.8
Conflicts:
assemble/pom.xml
test/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6cc07fa6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6cc07fa6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6cc07fa6
Branch: refs/heads/master
Commit: 6cc07fa633fdbf135e3b5d14969e6de5ff8870ef
Parents: 1bba1ee 9ad7111
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Jul 22 19:30:50 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Jul 22 19:30:50 2016 -0400
----------------------------------------------------------------------
README.md | 10 +-
assemble/build.sh | 2 +-
assemble/pom.xml | 152 ++++++++++++++-------------
docs/pom.xml | 248 ++++++++++++++++++++++-----------------------
pom.xml | 2 +-
server/native/pom.xml | 1 +
test/pom.xml | 55 ----------
7 files changed, 208 insertions(+), 262 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6cc07fa6/README.md
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6cc07fa6/assemble/pom.xml
----------------------------------------------------------------------
diff --cc assemble/pom.xml
index 1b7d054,4bb937c..9c1639a
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@@ -122,7 -151,8 +151,8 @@@
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-math</artifactId>
+ <artifactId>commons-math3</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@@ -250,93 -327,5 +327,22 @@@
</plugins>
</build>
</profile>
+ <profile>
- <id>assemble</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>binary-assembly</id>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>src/main/assemblies/binary-release.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>make-accumulo-home</id>
- <activation>
- <!-- always activate, unless explicitly de-activated -->
- <file>
- <exists>pom.xml</exists>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>directory-assembly</id>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <finalName>${project.build.finalName}</finalName>
- <outputDirectory>${DEV_ACCUMULO_HOME}</outputDirectory>
- <formats>
- <format>dir</format>
- </formats>
- <descriptors>
- <descriptor>src/main/assemblies/dev-directory.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>docs</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-docs</artifactId>
- <classifier>user-manual</classifier>
- <type>html</type>
- </dependency>
- </dependencies>
- </profile>
- <profile>
+ <!-- create shaded test jar appropriate for running ITs on MapReduce -->
+ <id>mrit</id>
+ <activation>
+ <property>
+ <name>mrit</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-test</artifactId>
+ <classifier>mrit</classifier>
++ <optional>true</optional>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6cc07fa6/docs/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6cc07fa6/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6cc07fa6/server/native/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6cc07fa6/test/pom.xml
----------------------------------------------------------------------
diff --cc test/pom.xml
index b6c392c,a78ba7e..92aeeaf
--- a/test/pom.xml
+++ b/test/pom.xml
@@@ -286,117 -235,43 +286,62 @@@
</build>
<profiles>
<profile>
- <id>shared-mini-for-it</id>
- <!--
- <id>hadoop-default</id>
-- <activation>
-- <property>
- <name>!skipITs</name>
- <name>!hadoop.profile</name>
-- </property>
-- </activation>
- -->
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>setup-mini-classpath</id>
- <goals>
- <goal>build-classpath</goal>
- </goals>
- <phase>pre-integration-test</phase>
- <configuration>
- <includeScope>test</includeScope>
- <outputProperty>accumulo-it-mini-classpath</outputProperty>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>run-mini-for-integration-tests</id>
- <goals>
- <goal>java</goal>
- </goals>
- <phase>pre-integration-test</phase>
- <configuration>
- <mainClass>org.apache.accumulo.maven.plugin.StartMojo</mainClass>
- <classpathScope>test</classpathScope>
- <arguments>
- <!-- These first two should stay static -->
- <argument>${project.build.directory}</argument>
- <argument>${accumulo-it-mini-classpath}</argument>
- <!-- InstanceName RootPassword, one pair per MiniAccumuloCluster -->
- <argument>testInstance1 testRootPassword1</argument>
- </arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <properties>
- <!-- Denotes intention and allows the enforcer plugin to pass when
- the user is relying on default behavior; won't work to activate profile -->
- <hadoop.profile>2</hadoop.profile>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-distcp</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-- </profile>
- <!-- profile for building against Hadoop 2.x
- XXX Since this is the default, make sure to sync hadoop-default when changing.
- Activate using: mvn -Dhadoop.profile=2 -->
-- <profile>
- <id>hadoop-2</id>
+ <!-- create shaded test jar appropriate for running ITs on MapReduce -->
+ <id>mrit</id>
<activation>
<property>
- <name>hadoop.profile</name>
- <value>2</value>
+ <name>mrit</name>
</property>
</activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-distcp</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <configuration>
+ <artifactSet>
+ <excludes>
+ <exclude>com.google.auto.service</exclude>
+ <exclude>com.google.auto</exclude>
+ <exclude>javax.servlet:servlet-api</exclude>
+ <exclude>org.apache.accumulo:accumulo-native</exclude>
+ <exclude>org.slf4j:slf4j-log4j12</exclude>
+ </excludes>
+ </artifactSet>
+ <shadedArtifactAttached>true</shadedArtifactAttached>
+ <shadedClassifierName>mrit</shadedClassifierName>
+ <createDependencyReducedPom>false</createDependencyReducedPom>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/DEPENDENCIES</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <manifestEntries>
+ <Sealed>false</Sealed>
+ <Main-Class>org.apache.accumulo.test.mrit.IntegrationTestMapReduce</Main-Class>
+ </manifestEntries>
+ </transformer>
+ </transformers>
+ </configuration>
+ <executions>
+ <execution>
+ <id>create-shaded-mrit</id>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</profile>
</profiles>
</project>
[3/6] accumulo git commit: ACCUMULO-4390 Remove unnecessary build
profiles
Posted by ct...@apache.org.
ACCUMULO-4390 Remove unnecessary build profiles
* Remove docs and assemble profiles (always run their tasks)
* Trigger attaching src.tar.gz when created with apache-release profile
* Remove unused vestigial shared-mini-for-it profile
* Ensure dependencies for non-jars are optional, so they don't get
included transitively
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9ad71110
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9ad71110
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9ad71110
Branch: refs/heads/master
Commit: 9ad71110d0382b23962d9305096add2d380afd25
Parents: cfebe56
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Jul 22 18:29:27 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Jul 22 18:43:03 2016 -0400
----------------------------------------------------------------------
README.md | 10 +-
assemble/build.sh | 2 +-
assemble/pom.xml | 151 ++++++++++++++-------------
docs/pom.xml | 248 ++++++++++++++++++++++-----------------------
pom.xml | 2 +-
server/native/pom.xml | 1 +
test/pom.xml | 55 ----------
7 files changed, 207 insertions(+), 262 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ad71110/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index a62df38..f3d7bca 100644
--- a/README.md
+++ b/README.md
@@ -60,16 +60,14 @@ Building
Accumulo uses [Maven][9] to compile, [test][3], and package its source. The
following command will build the binary tar.gz from source. Note, these
instructions will not work for the Accumulo binary distribution as it does not
-include source.
+include source. If you just want to build without waiting for the tests to
+run, add `-DskipTests`.
- mvn package -P assemble
+ mvn package
This command produces a file at the following location.
- assemble/target/accumulo-X.Y.Z-SNAPSHOT-bin.tar.gz
-
-This will not include documentation, adding the `-P docs` option to the maven
-command will build documentation.
+ assemble/target/accumulo-<version>-bin.tar.gz
API
---
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ad71110/assemble/build.sh
----------------------------------------------------------------------
diff --git a/assemble/build.sh b/assemble/build.sh
index 9bc0beb..c04bff7 100755
--- a/assemble/build.sh
+++ b/assemble/build.sh
@@ -277,7 +277,7 @@ if [[ $1 == '--create-release-candidate' ]]; then
elif [[ $1 == '--test' ]]; then
cacheGPG
# build a tag, but with tests
- runOrFail mvn clean install -P apache-release,thrift,assemble,docs,accumulo-release
+ runOrFail mvn clean install -P apache-release,accumulo-release,thrift
elif [[ $1 == '--create-email' ]]; then
shift
createEmail "$@"
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ad71110/assemble/pom.xml
----------------------------------------------------------------------
diff --git a/assemble/pom.xml b/assemble/pom.xml
index 58016ef..4bb937c 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -34,139 +34,180 @@
<dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-docs</artifactId>
+ <classifier>user-manual</classifier>
+ <type>html</type>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-examples-simple</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-fate</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-gc</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-master</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-minicluster</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-monitor</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-native</artifactId>
<type>tar.gz</type>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-proxy</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-server-base</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-shell</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-start</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-test</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-trace</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-tracer</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-tserver</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-vfs2</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
+ <optional>true</optional>
</dependency>
</dependencies>
<build>
@@ -219,11 +260,47 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>directory-assembly</id>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <finalName>${project.build.finalName}</finalName>
+ <outputDirectory>${DEV_ACCUMULO_HOME}</outputDirectory>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <descriptors>
+ <descriptor>src/main/assemblies/dev-directory.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ <execution>
+ <id>binary-assembly</id>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assemblies/binary-release.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<profiles>
<profile>
- <id>accumulo-release</id>
+ <!-- attach source release when it is created by the apache-release profile -->
+ <id>apache-release</id>
<build>
<plugins>
<plugin>
@@ -250,77 +327,5 @@
</plugins>
</build>
</profile>
- <profile>
- <id>assemble</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>binary-assembly</id>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>src/main/assemblies/binary-release.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>make-accumulo-home</id>
- <activation>
- <!-- always activate, unless explicitly de-activated -->
- <file>
- <exists>pom.xml</exists>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>directory-assembly</id>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <finalName>${project.build.finalName}</finalName>
- <outputDirectory>${DEV_ACCUMULO_HOME}</outputDirectory>
- <formats>
- <format>dir</format>
- </formats>
- <descriptors>
- <descriptor>src/main/assemblies/dev-directory.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>docs</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-docs</artifactId>
- <classifier>user-manual</classifier>
- <type>html</type>
- </dependency>
- </dependencies>
- </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ad71110/docs/pom.xml
----------------------------------------------------------------------
diff --git a/docs/pom.xml b/docs/pom.xml
index b470081..9c5a333 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -26,132 +26,128 @@
<packaging>pom</packaging>
<name>Apache Accumulo Documentation</name>
<description>User documentation for Apache Accumulo.</description>
- <profiles>
- <profile>
- <id>docs</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-core</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-asciidoc</id>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <phase>compile</phase>
- <configuration>
- <outputDirectory>${project.build.directory}/asciidoc</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/asciidoc</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctor-maven-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-core</artifactId>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-asciidoc</id>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <phase>compile</phase>
<configuration>
- <backend>html</backend>
- <doctype>book</doctype>
- <embedAssets>true</embedAssets>
- <imagesDir>${project.build.directory}/asciidoc/images</imagesDir>
- <sourceDirectory>${project.build.directory}/asciidoc</sourceDirectory>
- <sourceHighlighter>highlightjs</sourceHighlighter>
+ <outputDirectory>${project.build.directory}/asciidoc</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/asciidoc</directory>
+ </resource>
+ </resources>
</configuration>
- <executions>
- <execution>
- <id>output-html</id>
- <goals>
- <goal>process-asciidoc</goal>
- </goals>
- <phase>prepare-package</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>prep-output-dir</id>
- <goals>
- <goal>exec</goal>
- </goals>
- <phase>compile</phase>
- <configuration>
- <executable>mkdir</executable>
- <arguments>
- <argument>-p</argument>
- <argument>${project.build.directory}/asciidoc/appendices</argument>
- </arguments>
- </configuration>
- </execution>
- <execution>
- <id>config-html</id>
- <goals>
- <goal>java</goal>
- </goals>
- <phase>compile</phase>
- <configuration>
- <mainClass>org.apache.accumulo.core.conf.ConfigurationDocGen</mainClass>
- <classpathScope>compile</classpathScope>
- <arguments>
- <argument>--generate-html</argument>
- <argument>${project.build.directory}/config.html</argument>
- </arguments>
- </configuration>
- </execution>
- <execution>
- <id>config-appendix</id>
- <goals>
- <goal>java</goal>
- </goals>
- <phase>compile</phase>
- <configuration>
- <mainClass>org.apache.accumulo.core.conf.ConfigurationDocGen</mainClass>
- <classpathScope>compile</classpathScope>
- <arguments>
- <argument>--generate-asciidoc</argument>
- <argument>${project.build.directory}/asciidoc/appendices/config.txt</argument>
- </arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-user-manual-html</id>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>${project.build.directory}/generated-docs/accumulo_user_manual.html</file>
- <type>html</type>
- <classifier>user-manual</classifier>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.asciidoctor</groupId>
+ <artifactId>asciidoctor-maven-plugin</artifactId>
+ <configuration>
+ <backend>html</backend>
+ <doctype>book</doctype>
+ <embedAssets>true</embedAssets>
+ <imagesDir>${project.build.directory}/asciidoc/images</imagesDir>
+ <sourceDirectory>${project.build.directory}/asciidoc</sourceDirectory>
+ <sourceHighlighter>highlightjs</sourceHighlighter>
+ </configuration>
+ <executions>
+ <execution>
+ <id>output-html</id>
+ <goals>
+ <goal>process-asciidoc</goal>
+ </goals>
+ <phase>prepare-package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>prep-output-dir</id>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <phase>compile</phase>
+ <configuration>
+ <executable>mkdir</executable>
+ <arguments>
+ <argument>-p</argument>
+ <argument>${project.build.directory}/asciidoc/appendices</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ <execution>
+ <id>config-html</id>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <phase>compile</phase>
+ <configuration>
+ <mainClass>org.apache.accumulo.core.conf.ConfigurationDocGen</mainClass>
+ <classpathScope>compile</classpathScope>
+ <arguments>
+ <argument>--generate-html</argument>
+ <argument>${project.build.directory}/config.html</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ <execution>
+ <id>config-appendix</id>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <phase>compile</phase>
+ <configuration>
+ <mainClass>org.apache.accumulo.core.conf.ConfigurationDocGen</mainClass>
+ <classpathScope>compile</classpathScope>
+ <arguments>
+ <argument>--generate-asciidoc</argument>
+ <argument>${project.build.directory}/asciidoc/appendices/config.txt</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-user-manual-html</id>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>${project.build.directory}/generated-docs/accumulo_user_manual.html</file>
+ <type>html</type>
+ <classifier>user-manual</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ad71110/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5f7caae..b9b2168 100644
--- a/pom.xml
+++ b/pom.xml
@@ -659,7 +659,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
- <arguments>-P !autoformat,thrift,assemble,docs,sunny -Dtimeout.factor=2 ${extraReleaseArgs}</arguments>
+ <arguments>-P !autoformat,thrift,sunny -Dtimeout.factor=2 ${extraReleaseArgs}</arguments>
<autoVersionSubmodules>true</autoVersionSubmodules>
<goals>clean deploy</goals>
<preparationGoals>clean verify</preparationGoals>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ad71110/server/native/pom.xml
----------------------------------------------------------------------
diff --git a/server/native/pom.xml b/server/native/pom.xml
index 34c2bcf..b984110 100644
--- a/server/native/pom.xml
+++ b/server/native/pom.xml
@@ -34,6 +34,7 @@
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-tserver</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ad71110/test/pom.xml
----------------------------------------------------------------------
diff --git a/test/pom.xml b/test/pom.xml
index 4c73f89..a78ba7e 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -235,61 +235,6 @@
</build>
<profiles>
<profile>
- <id>shared-mini-for-it</id>
- <!--
- <activation>
- <property>
- <name>!skipITs</name>
- </property>
- </activation>
- -->
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>setup-mini-classpath</id>
- <goals>
- <goal>build-classpath</goal>
- </goals>
- <phase>pre-integration-test</phase>
- <configuration>
- <includeScope>test</includeScope>
- <outputProperty>accumulo-it-mini-classpath</outputProperty>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>run-mini-for-integration-tests</id>
- <goals>
- <goal>java</goal>
- </goals>
- <phase>pre-integration-test</phase>
- <configuration>
- <mainClass>org.apache.accumulo.maven.plugin.StartMojo</mainClass>
- <classpathScope>test</classpathScope>
- <arguments>
- <!-- These first two should stay static -->
- <argument>${project.build.directory}</argument>
- <argument>${accumulo-it-mini-classpath}</argument>
- <!-- InstanceName RootPassword, one pair per MiniAccumuloCluster -->
- <argument>testInstance1 testRootPassword1</argument>
- </arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>hadoop-default</id>
<activation>
<property>
[6/6] accumulo git commit: Merge branch '1.8'
Posted by ct...@apache.org.
Merge branch '1.8'
Conflicts:
assemble/pom.xml
test/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/976854c6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/976854c6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/976854c6
Branch: refs/heads/master
Commit: 976854c6ad258c46e1ea9b5fba2aa4535f71c816
Parents: 2c55074 6cc07fa
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Jul 22 19:39:40 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Jul 22 19:39:40 2016 -0400
----------------------------------------------------------------------
README.md | 10 +-
assemble/build.sh | 2 +-
assemble/pom.xml | 151 ++++++++++++++-------------
docs/pom.xml | 248 ++++++++++++++++++++++-----------------------
pom.xml | 2 +-
server/native/pom.xml | 1 +
test/pom.xml | 48 ---------
7 files changed, 207 insertions(+), 255 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/976854c6/README.md
----------------------------------------------------------------------
diff --cc README.md
index 4269001,fd57394..4cca80d
--- a/README.md
+++ b/README.md
@@@ -55,12 -53,13 +55,13 @@@ to run them after following the [instal
Building
--------
-Accumulo uses [Maven][9] to compile, [test][3], and package its source. The
+Accumulo uses [Maven] to compile, [test], and package its source. The
following command will build the binary tar.gz from source. Note, these
instructions will not work for the Accumulo binary distribution as it does not
- include source.
+ include source. If you just want to build without waiting for the tests to
+ run, add `-DskipTests`.
- mvn package -P assemble
+ mvn package
This command produces a file at the following location.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/976854c6/assemble/pom.xml
----------------------------------------------------------------------
diff --cc assemble/pom.xml
index 44dfceb,9c1639a..e009faa
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@@ -110,7 -136,13 +136,8 @@@
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-trace</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-tracer</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/976854c6/docs/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/976854c6/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 110cdc7,a09eb87..1c98549
--- a/pom.xml
+++ b/pom.xml
@@@ -724,10 -692,8 +724,10 @@@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
+ <!-- overridden version from ASF-17 parent pom -->
+ <version>2.5.3</version>
<configuration>
- <arguments>-P !autoformat,thrift,assemble,docs,sunny -Dtimeout.factor=2 ${extraReleaseArgs}</arguments>
+ <arguments>-P !autoformat,thrift,sunny -Dtimeout.factor=2 ${extraReleaseArgs}</arguments>
<autoVersionSubmodules>true</autoVersionSubmodules>
<goals>clean deploy</goals>
<preparationGoals>clean verify</preparationGoals>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/976854c6/server/native/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/976854c6/test/pom.xml
----------------------------------------------------------------------