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 <ctubb...@apache.org> Authored: Fri Jul 22 18:29:27 2016 -0400 Committer: Christopher Tubbs <ctubb...@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>
