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.6' into 1.7
Date Sat, 09 Jan 2016 07:19:03 GMT
Merge branch '1.6' into 1.7


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

Branch: refs/heads/master
Commit: d55fef70c7801f7481e255b8e5ed91242b8a06aa
Parents: 0ccba14 e85f14b
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Sat Jan 9 01:56:25 2016 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Sat Jan 9 01:56:25 2016 -0500

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


http://git-wip-us.apache.org/repos/asf/accumulo/blob/d55fef70/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 644f506,d51f406..0fa003a
--- a/pom.xml
+++ b/pom.xml
@@@ -717,182 -671,14 +717,9 @@@
          <plugin>
            <groupId>org.codehaus.mojo</groupId>
            <artifactId>exec-maven-plugin</artifactId>
 -          <version>1.2.1</version>
 -        </plugin>
 -        <plugin>
 -          <groupId>org.codehaus.mojo</groupId>
 -          <artifactId>latex-maven-plugin</artifactId>
 -          <version>1.1</version>
 +          <version>1.4.0</version>
          </plugin>
          <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>
-         <plugin>
            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-enforcer-plugin</artifactId>
            <configuration>
@@@ -1254,7 -1038,195 +1081,195 @@@
    </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>apache-release</id>
 +      <id>move-source-tarball</id>
        <build>
          <plugins>
            <plugin>


Mime
View raw message