accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [6/6] accumulo git commit: Merge branch '1.7'
Date Sat, 09 Jan 2016 07:19:05 GMT
Merge branch '1.7'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7c4ef06f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7c4ef06f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7c4ef06f

Branch: refs/heads/master
Commit: 7c4ef06f4b51f8c458407abd3771bd87aca3a36a
Parents: 8ff2ca8 d55fef7
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Sat Jan 9 02:18:26 2016 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Sat Jan 9 02:18:26 2016 -0500

----------------------------------------------------------------------
 pom.xml | 361 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 188 insertions(+), 173 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7c4ef06f/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 4149d7a,0fa003a..3f90af2
--- a/pom.xml
+++ b/pom.xml
@@@ -1286,14 -1081,222 +1113,202 @@@
    </reporting>
    <profiles>
      <profile>
+       <id>m2e</id>
+       <activation>
+         <property>
+           <name>m2e.version</name>
+         </property>
+       </activation>
+       <build>
+         <pluginManagement>
+           <plugins>
+             <!--This plugin's configuration is used to store Eclipse m2e settings only.
It has no influence on the Maven build itself.-->
+             <plugin>
+               <groupId>org.eclipse.m2e</groupId>
+               <artifactId>lifecycle-mapping</artifactId>
+               <version>1.0.0</version>
+               <configuration>
+                 <lifecycleMappingMetadata>
+                   <pluginExecutions>
+                     <pluginExecution>
+                       <pluginExecutionFilter>
+                         <groupId>org.apache.maven.plugins</groupId>
+                         <artifactId>maven-plugin-plugin</artifactId>
+                         <versionRange>[3.2,)</versionRange>
+                         <goals>
+                           <goal>helpmojo</goal>
+                           <goal>descriptor</goal>
+                         </goals>
+                       </pluginExecutionFilter>
+                       <action>
+                         <ignore />
+                       </action>
+                     </pluginExecution>
+                     <pluginExecution>
+                       <pluginExecutionFilter>
+                         <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
+                         <artifactId>maven-java-formatter-plugin</artifactId>
+                         <versionRange>[0.4,)</versionRange>
+                         <goals>
+                           <goal>format</goal>
+                         </goals>
+                       </pluginExecutionFilter>
+                       <action>
+                         <ignore />
+                       </action>
+                     </pluginExecution>
+                     <pluginExecution>
+                       <pluginExecutionFilter>
+                         <groupId>org.apache.maven.plugins</groupId>
+                         <artifactId>maven-checkstyle-plugin</artifactId>
+                         <versionRange>[2.13,)</versionRange>
+                         <goals>
+                           <goal>check</goal>
+                         </goals>
+                       </pluginExecutionFilter>
+                       <action>
+                         <ignore />
+                       </action>
+                     </pluginExecution>
+                     <pluginExecution>
+                       <pluginExecutionFilter>
+                         <groupId>org.apache.maven.plugins</groupId>
+                         <artifactId>maven-dependency-plugin</artifactId>
+                         <versionRange>[2.0,)</versionRange>
+                         <goals>
+                           <goal>copy-dependencies</goal>
+                         </goals>
+                       </pluginExecutionFilter>
+                       <action>
+                         <ignore />
+                       </action>
+                     </pluginExecution>
+                     <pluginExecution>
+                       <pluginExecutionFilter>
+                         <groupId>org.apache.maven.plugins</groupId>
+                         <artifactId>maven-remote-resources-plugin</artifactId>
+                         <versionRange>[1.0,)</versionRange>
+                         <goals>
+                           <goal>process</goal>
+                         </goals>
+                       </pluginExecutionFilter>
+                       <action>
+                         <ignore />
+                       </action>
+                     </pluginExecution>
+                     <pluginExecution>
+                       <pluginExecutionFilter>
+                         <groupId>org.apache.rat</groupId>
+                         <artifactId>apache-rat-plugin</artifactId>
+                         <versionRange>[0.8,)</versionRange>
+                         <goals>
+                           <goal>check</goal>
+                         </goals>
+                       </pluginExecutionFilter>
+                       <action>
+                         <ignore />
+                       </action>
+                     </pluginExecution>
+                     <pluginExecution>
+                       <pluginExecutionFilter>
+                         <groupId>org.codehaus.mojo</groupId>
+                         <artifactId>native-maven-plugin</artifactId>
+                         <versionRange>[1.0-alpha-7,)</versionRange>
+                         <goals>
+                           <goal>compile</goal>
+                           <goal>initialize</goal>
+                           <goal>javah</goal>
+                           <goal>link</goal>
+                           <goal>unzipinc</goal>
+                         </goals>
+                       </pluginExecutionFilter>
+                       <action>
+                         <ignore />
+                       </action>
+                     </pluginExecution>
+                     <pluginExecution>
+                       <pluginExecutionFilter>
+                         <groupId>org.codehaus.mojo</groupId>
+                         <artifactId>exec-maven-plugin</artifactId>
+                         <versionRange>[1.0,)</versionRange>
+                         <goals>
+                           <goal>exec</goal>
+                         </goals>
+                       </pluginExecutionFilter>
+                       <action>
+                         <ignore />
+                       </action>
+                     </pluginExecution>
+                     <pluginExecution>
+                       <pluginExecutionFilter>
+                         <groupId>org.apache.maven.plugins</groupId>
+                         <artifactId>maven-enforcer-plugin</artifactId>
+                         <versionRange>[1.0,)</versionRange>
+                         <goals>
+                           <goal>enforce</goal>
+                         </goals>
+                       </pluginExecutionFilter>
+                       <action>
+                         <ignore />
+                       </action>
+                     </pluginExecution>
+                     <pluginExecution>
+                       <pluginExecutionFilter>
+                         <groupId>org.apache.maven.plugins</groupId>
+                         <artifactId>maven-invoker-plugin</artifactId>
+                         <versionRange>[1.7,)</versionRange>
+                         <goals>
+                           <goal>install</goal>
+                         </goals>
+                       </pluginExecutionFilter>
+                       <action>
+                         <ignore />
+                       </action>
+                     </pluginExecution>
+                     <pluginExecution>
+                       <pluginExecutionFilter>
+                         <groupId>com.github.ekryd.sortpom</groupId>
+                         <artifactId>sortpom-maven-plugin</artifactId>
+                         <versionRange>[2.4.0,)</versionRange>
+                         <goals>
+                           <goal>sort</goal>
+                           <goal>verify</goal>
+                         </goals>
+                       </pluginExecutionFilter>
+                       <action>
+                         <ignore />
+                       </action>
+                     </pluginExecution>
+                     <pluginExecution>
+                       <pluginExecutionFilter>
+                         <groupId>com.github.koraktor</groupId>
+                         <artifactId>mavanagaiata</artifactId>
+                         <versionRange>[0.6.1,)</versionRange>
+                         <goals>
+                           <goal>commit</goal>
+                         </goals>
+                       </pluginExecutionFilter>
+                       <action>
+                         <ignore />
+                       </action>
+                     </pluginExecution>
+                   </pluginExecutions>
+                 </lifecycleMappingMetadata>
+               </configuration>
+             </plugin>
+           </plugins>
+         </pluginManagement>
+       </build>
+     </profile>
+     <profile>
 -      <id>move-source-tarball</id>
 -      <build>
 -        <plugins>
 -          <plugin>
 -            <groupId>org.codehaus.mojo</groupId>
 -            <artifactId>exec-maven-plugin</artifactId>
 -            <inherited>false</inherited>
 -            <executions>
 -              <execution>
 -                <id>rename-source-release-assembly</id>
 -                <goals>
 -                  <goal>exec</goal>
 -                </goals>
 -                <phase>package</phase>
 -                <configuration>
 -                  <executable>mv</executable>
 -                  <workingDirectory>${project.build.directory}</workingDirectory>
 -                  <commandlineArgs>-n accumulo-${project.version}-source-release.tar.gz
accumulo-${project.version}-src.tar.gz</commandlineArgs>
 -                  <successCodes>
 -                    <successCode>0</successCode>
 -                    <successCode>1</successCode>
 -                  </successCodes>
 -                </configuration>
 -              </execution>
 -            </executions>
 -          </plugin>
 -        </plugins>
 -      </build>
 +      <id>accumulo-release</id>
 +      <properties>
 +        <!-- some properties to make the release build a bit faster -->
 +        <checkstyle.skip>true</checkstyle.skip>
 +        <findbugs.skip>true</findbugs.skip>
 +        <skipITs>true</skipITs>
 +        <skipTests>true</skipTests>
 +      </properties>
      </profile>
      <profile>
        <!-- on by default, but disable with '-P !autoformat' or '-DskipFormat' -->


Mime
View raw message