accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [4/6] accumulo git commit: Merge branch '1.7' into 1.8
Date Fri, 22 Jul 2016 23:39:55 GMT
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 <ctubbsii@apache.org>
Authored: Fri Jul 22 19:30:50 2016 -0400
Committer: Christopher Tubbs <ctubbsii@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>


Mime
View raw message