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:45 UTC
[1/5] git commit: ACCUMULO-2625 Remove build warnings for 1.4
Repository: accumulo
Updated Branches:
refs/heads/master 94008f6a1 -> ca2d4ebd9
ACCUMULO-2625 Remove build warnings for 1.4
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4d53f2e5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4d53f2e5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4d53f2e5
Branch: refs/heads/master
Commit: 4d53f2e5513f944e220fffbaa603a0e460760fdb
Parents: 7461ed9
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Apr 18 12:26:02 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Apr 18 12:26:02 2014 -0400
----------------------------------------------------------------------
pom.xml | 6 +++---
src/core/pom.xml | 4 ----
2 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4d53f2e5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 87c50b9..615d0bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -496,7 +496,7 @@
<goal>jdeb</goal>
</goals>
<configuration>
- <deb>${project.build.directory}/${artifactId}_${project.version}.deb</deb>
+ <deb>${project.build.directory}/${project.artifactId}_${project.version}.deb</deb>
<attach>false</attach>
<controlDir>src/packages/deb/accumulo</controlDir>
<installDir>/usr/lib/accumulo</installDir>
@@ -592,7 +592,7 @@
<attach>false</attach>
<controlDir>src/packages/deb/accumulo-native</controlDir>
<installDir>/usr/lib/accumulo</installDir>
- <deb>${project.build.directory}/${artifactId}-native_${project.version}-${os.arch}.deb</deb>
+ <deb>${project.build.directory}/${project.artifactId}-native_${project.version}-${os.arch}.deb</deb>
<dataSet>
<data>
<src>src/server/src/main/c++</src>
@@ -632,7 +632,7 @@
<attach>false</attach>
<controlDir>src/packages/deb/accumulo-test</controlDir>
<installDir>/usr/lib/accumulo</installDir>
- <deb>${project.build.directory}/${artifactId}-test_${project.version}-${os.arch}.deb</deb>
+ <deb>${project.build.directory}/${project.artifactId}-test_${project.version}-${os.arch}.deb</deb>
<dataSet>
<data>
<src>test</src>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4d53f2e5/src/core/pom.xml
----------------------------------------------------------------------
diff --git a/src/core/pom.xml b/src/core/pom.xml
index b310764..7b5ff02 100644
--- a/src/core/pom.xml
+++ b/src/core/pom.xml
@@ -172,10 +172,6 @@
<artifactId>libthrift</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>cloudtrace</artifactId>
- </dependency>
- <dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
</dependency>
[3/5] git commit: Merge branch '1.4.6-SNAPSHOT' into 1.5.2-SNAPSHOT
Posted by ct...@apache.org.
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>
[4/5] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by ct...@apache.org.
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1645b4f6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1645b4f6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1645b4f6
Branch: refs/heads/master
Commit: 1645b4f6297f24ce815c6379acfbc67b334c64ec
Parents: 0550720 0aa1d03
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Apr 18 12:37:40 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Apr 18 12:37:40 2014 -0400
----------------------------------------------------------------------
pom.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1645b4f6/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 10dfcc8,9aeb7ee..f109643
--- a/pom.xml
+++ b/pom.xml
@@@ -520,6 -432,9 +520,8 @@@
<source>1.6</source>
<target>1.6</target>
<optimize>true</optimize>
- <encoding>UTF-8</encoding>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
</configuration>
</plugin>
<plugin>
[5/5] git commit: Merge branch '1.6.0-SNAPSHOT'
Posted by ct...@apache.org.
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ca2d4ebd
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ca2d4ebd
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ca2d4ebd
Branch: refs/heads/master
Commit: ca2d4ebd904240796c5a0cf9eb75881b60d47ea1
Parents: 94008f6 1645b4f
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Apr 18 12:37:51 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Apr 18 12:37:51 2014 -0400
----------------------------------------------------------------------
pom.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ca2d4ebd/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 2f22beb,f109643..6a82507
--- a/pom.xml
+++ b/pom.xml
@@@ -523,9 -517,11 +523,11 @@@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.7</source>
+ <target>1.7</target>
<optimize>true</optimize>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
</configuration>
</plugin>
<plugin>
[2/5] git commit: ACCUMULO-2529 Show compiler warnings in maven build
Posted by ct...@apache.org.
ACCUMULO-2529 Show compiler warnings in maven build
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3648c1bd
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3648c1bd
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3648c1bd
Branch: refs/heads/master
Commit: 3648c1bd3d4018ad13e14091aef237f5b5eac1ad
Parents: 4d53f2e
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Apr 18 12:27:28 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Apr 18 12:27:28 2014 -0400
----------------------------------------------------------------------
pom.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3648c1bd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 615d0bf..6ed7a61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -178,6 +178,8 @@
<source>1.6</source>
<target>1.6</target>
<optimize>true</optimize>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
</configuration>
</plugin>
<plugin>