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 2014/04/18 18:40:47 UTC
[3/5] git commit: Merge branch '1.4.6-SNAPSHOT' into 1.5.2-SNAPSHOT
Merge branch '1.4.6-SNAPSHOT' into 1.5.2-SNAPSHOT
Conflicts:
pom.xml
src/core/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0aa1d039
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0aa1d039
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0aa1d039
Branch: refs/heads/master
Commit: 0aa1d039e9369b00e3c19e1abaf92009d18b0496
Parents: 708ad54 3648c1b
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Apr 18 12:35:15 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Apr 18 12:35:15 2014 -0400
----------------------------------------------------------------------
pom.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0aa1d039/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 9464bff,6ed7a61..9aeb7ee
--- a/pom.xml
+++ b/pom.xml
@@@ -355,159 -336,6 +355,161 @@@
<pluginManagement>
<plugins>
<plugin>
+ <groupId>com.google.code.sortpom</groupId>
+ <artifactId>maven-sortpom-plugin</artifactId>
+ <version>2.1.0</version>
+ <configuration>
+ <predefinedSortOrder>recommended_2008_06</predefinedSortOrder>
+ <lineSeparator>\n</lineSeparator>
+ <expandEmptyElements>false</expandEmptyElements>
+ <nrOfIndentSpace>2</nrOfIndentSpace>
+ <sortDependencies>scope,groupId,artifactId</sortDependencies>
+ <sortProperties>true</sortProperties>
+ <verifyFail>Stop</verifyFail>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>com.github.koraktor</groupId>
+ <artifactId>mavanagaiata</artifactId>
+ <version>0.6.1</version>
+ <configuration>
+ <skipNoGit>true</skipNoGit>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <attach>false</attach>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <issueManagementSystems>
+ <issueManagementSystem>JIRA</issueManagementSystem>
+ </issueManagementSystems>
+ <onlyCurrentVersion>true</onlyCurrentVersion>
+ <statusIds>Closed,Resolved</statusIds>
+ <maxEntries>10000</maxEntries>
+ <useJql>true</useJql>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>lib</directory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileset>
+ <fileset>
+ <directory>docs/apidocs</directory>
+ </fileset>
+ <fileset>
+ <directory>test</directory>
+ <includes>
+ <include>**/*.so</include>
+ </includes>
+ </fileset>
+ <fileset>
+ <directory>./</directory>
+ <includes>
+ <include>**/*.pyc</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <optimize>true</optimize>
+ <encoding>UTF-8</encoding>
++ <showDeprecation>true</showDeprecation>
++ <showWarnings>true</showWarnings>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!-- should be in the Apache parent, but isn't -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.8</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Sealed>${sealJars}</Sealed>
+ <Implementation-Build>${mvngit.commit.id}</Implementation-Build>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ <quiet>true</quiet>
+ <reportOutputDirectory>docs</reportOutputDirectory>
+ <javadocVersion>1.6</javadocVersion>
+ <additionalJOption>-J-Xmx512m</additionalJOption>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <arguments>-P apache-release,check-licenses,thrift,native,assemble,docs,rpm,deb</arguments>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ <goals>clean compile javadoc:aggregate deploy</goals>
+ <preparationGoals>clean compile javadoc:aggregate verify</preparationGoals>
+ <tagNameFormat>@{project.version}</tagNameFormat>
+ <releaseProfiles>seal-jars</releaseProfiles>
+ <useReleaseProfile>false</useReleaseProfile>
+ <pushChanges>false</pushChanges>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.3</version>
+ <configuration>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.10</version>
+ <configuration>
+ <excludes>
+ <exclude>docs/apidocs/package-list</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.8</version>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.5.2</version>