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 2015/05/08 02:03:07 UTC
[1/7] accumulo git commit: ACCUMULO-3782 Automatically run sortpom
Repository: accumulo
Updated Branches:
refs/heads/1.7 a8ef75ee0 -> 61eea4243
refs/heads/master 68b8cd7c9 -> b6739a200
ACCUMULO-3782 Automatically run sortpom
* Enable sortpom-maven-plugin by default in the autoformat profile.
* Verify pom sort after sorting.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6d8f47c3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6d8f47c3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6d8f47c3
Branch: refs/heads/1.7
Commit: 6d8f47c35285c7f76d2cc84db01719a19008ce31
Parents: 6771ff7
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu May 7 17:10:59 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu May 7 17:42:52 2015 -0400
----------------------------------------------------------------------
pom.xml | 30 ++++++++++++------------------
1 file changed, 12 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6d8f47c3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3188cac..3aaff0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -547,6 +547,7 @@
<version>2.4.0</version>
<configuration>
<predefinedSortOrder>recommended_2008_06</predefinedSortOrder>
+ <createBackupFile>false</createBackupFile>
<lineSeparator>\n</lineSeparator>
<expandEmptyElements>false</expandEmptyElements>
<nrOfIndentSpace>2</nrOfIndentSpace>
@@ -862,6 +863,7 @@
<artifactId>sortpom-maven-plugin</artifactId>
<versionRange>[2.4.0,)</versionRange>
<goals>
+ <goal>sort</goal>
<goal>verify</goal>
</goals>
</pluginExecutionFilter>
@@ -954,7 +956,7 @@
</pluginManagement>
<plugins>
<plugin>
- <!-- verify only; 'mvn clean -P sortpom' sorts -->
+ <!-- verify before compile; should be sorted already -->
<groupId>com.github.ekryd.sortpom</groupId>
<artifactId>sortpom-maven-plugin</artifactId>
<executions>
@@ -963,7 +965,7 @@
<goals>
<goal>verify</goal>
</goals>
- <phase>validate</phase>
+ <phase>process-resources</phase>
</execution>
</executions>
</plugin>
@@ -1314,21 +1316,6 @@
<build>
<plugins>
<plugin>
- <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
- <artifactId>maven-java-formatter-plugin</artifactId>
- <configuration>
- <configFile>${eclipseFormatterStyle}</configFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <!-- 'mvn clean -P sortpom' sorts -->
- <id>sortpom</id>
- <build>
- <plugins>
- <plugin>
<groupId>com.github.ekryd.sortpom</groupId>
<artifactId>sortpom-maven-plugin</artifactId>
<executions>
@@ -1337,10 +1324,17 @@
<goals>
<goal>sort</goal>
</goals>
- <phase>clean</phase>
+ <phase>process-sources</phase>
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
+ <artifactId>maven-java-formatter-plugin</artifactId>
+ <configuration>
+ <configFile>${eclipseFormatterStyle}</configFile>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
[5/7] accumulo git commit: ACCUMULO-2712 Use tarball-only assembly
Posted by ct...@apache.org.
ACCUMULO-2712 Use tarball-only assembly
* Added previously omitted use of tarball-only assembly descriptor
to avoid creating an unused zip.
* Cleaned up release profiles, since we no longer have to override
the one in the parent POM.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/61eea424
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/61eea424
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/61eea424
Branch: refs/heads/master
Commit: 61eea4243f202e7747c92452d642855870b500a0
Parents: 6d8f47c
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu May 7 19:23:21 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu May 7 19:23:21 2015 -0400
----------------------------------------------------------------------
assemble/pom.xml | 1 +
pom.xml | 39 ++++++++-------------------------------
server/native/pom.xml | 1 +
3 files changed, 10 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/61eea424/assemble/pom.xml
----------------------------------------------------------------------
diff --git a/assemble/pom.xml b/assemble/pom.xml
index f15c5f4..e88cd81 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -298,6 +298,7 @@
</goals>
<phase>package</phase>
<configuration>
+ <finalName>${project.build.finalName}</finalName>
<outputDirectory>${DEV_ACCUMULO_HOME}</outputDirectory>
<formats>
<format>dir</format>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/61eea424/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3aaff0f..9ab40e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,6 +142,7 @@
<sealJars>false</sealJars>
<!-- overwritten in hadoop profiles -->
<slf4j.version>1.7.5</slf4j.version>
+ <sourceReleaseAssemblyDescriptor>source-release-tar</sourceReleaseAssemblyDescriptor>
<!-- Thrift version -->
<thrift.version>0.9.1</thrift.version>
<!-- ZooKeeper version -->
@@ -574,6 +575,8 @@
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<attach>false</attach>
+ <!-- this is for releases; override for other assembly executions -->
+ <finalName>accumulo-${project.version}</finalName>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</plugin>
@@ -646,12 +649,12 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
- <arguments>-P !autoformat,apache-release,thrift,assemble,docs,sunny -Dtimeout.factor=2</arguments>
+ <arguments>-P !autoformat,thrift,assemble,docs,sunny -Dtimeout.factor=2</arguments>
<autoVersionSubmodules>true</autoVersionSubmodules>
<goals>clean deploy</goals>
<preparationGoals>clean verify</preparationGoals>
<tagNameFormat>@{project.version}</tagNameFormat>
- <releaseProfiles>seal-jars,skip-findbugs</releaseProfiles>
+ <releaseProfiles>apache-release,move-source-tarball,seal-jars,skip-findbugs</releaseProfiles>
<useReleaseProfile>false</useReleaseProfile>
<pushChanges>false</pushChanges>
<localCheckout>true</localCheckout>
@@ -1250,46 +1253,20 @@
</reporting>
<profiles>
<profile>
- <id>apache-release</id>
+ <id>move-source-tarball</id>
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.apache.resources</groupId>
- <artifactId>apache-source-release-assembly-descriptor</artifactId>
- <version>1.0.4</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>source-release-assembly</id>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>validate</phase>
- <configuration>
- <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
- <finalName>accumulo-${project.version}</finalName>
- <descriptorRefs>
- <descriptorRef>source-release-zip-tar</descriptorRef>
- </descriptorRefs>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <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>validate</phase>
+ <phase>package</phase>
<configuration>
<executable>mv</executable>
<workingDirectory>${project.build.directory}</workingDirectory>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/61eea424/server/native/pom.xml
----------------------------------------------------------------------
diff --git a/server/native/pom.xml b/server/native/pom.xml
index d175093..5a18728 100644
--- a/server/native/pom.xml
+++ b/server/native/pom.xml
@@ -81,6 +81,7 @@
<configuration>
<attach>true</attach>
<appendAssemblyId>false</appendAssemblyId>
+ <finalName>${project.build.finalName}</finalName>
<descriptors>
<descriptor>src/main/assemblies/native-tarball.xml</descriptor>
</descriptors>
[7/7] accumulo git commit: Merge branch '1.7'
Posted by ct...@apache.org.
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/b6739a20
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b6739a20
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b6739a20
Branch: refs/heads/master
Commit: b6739a200694a419ef3baeac7ec1e448153d5fcd
Parents: 68b8cd7 61eea42
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu May 7 19:54:16 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu May 7 19:54:16 2015 -0400
----------------------------------------------------------------------
assemble/pom.xml | 1 +
examples/simple/pom.xml | 9 ----
maven-plugin/pom.xml | 3 ++
maven-plugin/src/it/plugin-test/pom.xml | 7 ---
pom.xml | 72 +++++++++++-----------------
server/base/pom.xml | 9 ----
server/gc/pom.xml | 11 -----
server/master/pom.xml | 11 -----
server/monitor/pom.xml | 9 ----
server/native/pom.xml | 8 +---
server/tracer/pom.xml | 11 -----
server/tserver/pom.xml | 9 ----
12 files changed, 34 insertions(+), 126 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6739a20/assemble/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6739a20/examples/simple/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6739a20/maven-plugin/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6739a20/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6739a20/server/base/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6739a20/server/gc/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6739a20/server/master/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6739a20/server/monitor/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6739a20/server/native/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6739a20/server/tracer/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6739a20/server/tserver/pom.xml
----------------------------------------------------------------------
[6/7] accumulo git commit: ACCUMULO-2712 Use tarball-only assembly
Posted by ct...@apache.org.
ACCUMULO-2712 Use tarball-only assembly
* Added previously omitted use of tarball-only assembly descriptor
to avoid creating an unused zip.
* Cleaned up release profiles, since we no longer have to override
the one in the parent POM.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/61eea424
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/61eea424
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/61eea424
Branch: refs/heads/1.7
Commit: 61eea4243f202e7747c92452d642855870b500a0
Parents: 6d8f47c
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu May 7 19:23:21 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu May 7 19:23:21 2015 -0400
----------------------------------------------------------------------
assemble/pom.xml | 1 +
pom.xml | 39 ++++++++-------------------------------
server/native/pom.xml | 1 +
3 files changed, 10 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/61eea424/assemble/pom.xml
----------------------------------------------------------------------
diff --git a/assemble/pom.xml b/assemble/pom.xml
index f15c5f4..e88cd81 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -298,6 +298,7 @@
</goals>
<phase>package</phase>
<configuration>
+ <finalName>${project.build.finalName}</finalName>
<outputDirectory>${DEV_ACCUMULO_HOME}</outputDirectory>
<formats>
<format>dir</format>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/61eea424/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3aaff0f..9ab40e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,6 +142,7 @@
<sealJars>false</sealJars>
<!-- overwritten in hadoop profiles -->
<slf4j.version>1.7.5</slf4j.version>
+ <sourceReleaseAssemblyDescriptor>source-release-tar</sourceReleaseAssemblyDescriptor>
<!-- Thrift version -->
<thrift.version>0.9.1</thrift.version>
<!-- ZooKeeper version -->
@@ -574,6 +575,8 @@
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<attach>false</attach>
+ <!-- this is for releases; override for other assembly executions -->
+ <finalName>accumulo-${project.version}</finalName>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</plugin>
@@ -646,12 +649,12 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
- <arguments>-P !autoformat,apache-release,thrift,assemble,docs,sunny -Dtimeout.factor=2</arguments>
+ <arguments>-P !autoformat,thrift,assemble,docs,sunny -Dtimeout.factor=2</arguments>
<autoVersionSubmodules>true</autoVersionSubmodules>
<goals>clean deploy</goals>
<preparationGoals>clean verify</preparationGoals>
<tagNameFormat>@{project.version}</tagNameFormat>
- <releaseProfiles>seal-jars,skip-findbugs</releaseProfiles>
+ <releaseProfiles>apache-release,move-source-tarball,seal-jars,skip-findbugs</releaseProfiles>
<useReleaseProfile>false</useReleaseProfile>
<pushChanges>false</pushChanges>
<localCheckout>true</localCheckout>
@@ -1250,46 +1253,20 @@
</reporting>
<profiles>
<profile>
- <id>apache-release</id>
+ <id>move-source-tarball</id>
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.apache.resources</groupId>
- <artifactId>apache-source-release-assembly-descriptor</artifactId>
- <version>1.0.4</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>source-release-assembly</id>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>validate</phase>
- <configuration>
- <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
- <finalName>accumulo-${project.version}</finalName>
- <descriptorRefs>
- <descriptorRef>source-release-zip-tar</descriptorRef>
- </descriptorRefs>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <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>validate</phase>
+ <phase>package</phase>
<configuration>
<executable>mv</executable>
<workingDirectory>${project.build.directory}</workingDirectory>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/61eea424/server/native/pom.xml
----------------------------------------------------------------------
diff --git a/server/native/pom.xml b/server/native/pom.xml
index d175093..5a18728 100644
--- a/server/native/pom.xml
+++ b/server/native/pom.xml
@@ -81,6 +81,7 @@
<configuration>
<attach>true</attach>
<appendAssemblyId>false</appendAssemblyId>
+ <finalName>${project.build.finalName}</finalName>
<descriptors>
<descriptor>src/main/assemblies/native-tarball.xml</descriptor>
</descriptors>
[2/7] accumulo git commit: ACCUMULO-3781 Create autoformat profile
Posted by ct...@apache.org.
ACCUMULO-3781 Create autoformat profile
* Place maven-java-formatter-plugin in autoformat profile
* Enable skipping of profile with '-P !autoformat' or '-DskipFormat'
* Add '-P !autoformat' to release profile and maven-plugin invoked IT
* Simplify reference to config location using ${project.parent.basedir}
* Enable overriding formatter with '-DeclipseFormatterStyle=/some/absolute/path'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6771ff7d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6771ff7d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6771ff7d
Branch: refs/heads/1.7
Commit: 6771ff7d431915eb0ad19198c0d8d6edbce49d88
Parents: a8ef75e
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu May 7 16:51:01 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu May 7 17:42:52 2015 -0400
----------------------------------------------------------------------
examples/simple/pom.xml | 9 --------
maven-plugin/pom.xml | 3 +++
maven-plugin/src/it/plugin-test/pom.xml | 7 -------
pom.xml | 31 +++++++++++++++++++++-------
server/base/pom.xml | 9 --------
server/gc/pom.xml | 11 ----------
server/master/pom.xml | 11 ----------
server/monitor/pom.xml | 9 --------
server/native/pom.xml | 7 -------
server/tracer/pom.xml | 11 ----------
server/tserver/pom.xml | 9 --------
11 files changed, 26 insertions(+), 91 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6771ff7d/examples/simple/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple/pom.xml b/examples/simple/pom.xml
index e83bf45..aa2f118 100644
--- a/examples/simple/pom.xml
+++ b/examples/simple/pom.xml
@@ -113,14 +113,5 @@
</plugin>
</plugins>
</pluginManagement>
- <plugins>
- <plugin>
- <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
- <artifactId>maven-java-formatter-plugin</artifactId>
- <configuration>
- <configFile>${project.basedir}/../../contrib/Eclipse-Accumulo-Codestyle.xml</configFile>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6771ff7d/maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index d0b618e..2c07d7d 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -110,6 +110,9 @@
<goal>clean</goal>
<goal>post-integration-test</goal>
</goals>
+ <profiles>
+ <profile>!autoformat</profile>
+ </profiles>
</configuration>
<executions>
<execution>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6771ff7d/maven-plugin/src/it/plugin-test/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugin/src/it/plugin-test/pom.xml b/maven-plugin/src/it/plugin-test/pom.xml
index 8a848e4..7654c96 100644
--- a/maven-plugin/src/it/plugin-test/pom.xml
+++ b/maven-plugin/src/it/plugin-test/pom.xml
@@ -113,13 +113,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
- <artifactId>maven-java-formatter-plugin</artifactId>
- <configuration>
- <configFile>${project.basedir}/../../../../contrib/Eclipse-Accumulo-Codestyle.xml</configFile>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6771ff7d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cd20445..3188cac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,6 +119,8 @@
<accumulo.release.version>${project.version}</accumulo.release.version>
<!-- bouncycastle version for test dependencies -->
<bouncycastle.version>1.50</bouncycastle.version>
+ <!-- relative path for Eclipse format; should override in child modules if necessary -->
+ <eclipseFormatterStyle>${project.parent.basedir}/contrib/Eclipse-Accumulo-Codestyle.xml</eclipseFormatterStyle>
<!-- findbugs-maven-plugin won't work on jdk8 or later; set to 3.0.0 or newer -->
<findbugs.version>3.0.0</findbugs.version>
<!-- surefire/failsafe plugin option -->
@@ -643,7 +645,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
- <arguments>-P apache-release,thrift,assemble,docs,sunny -Dtimeout.factor=2</arguments>
+ <arguments>-P !autoformat,apache-release,thrift,assemble,docs,sunny -Dtimeout.factor=2</arguments>
<autoVersionSubmodules>true</autoVersionSubmodules>
<goals>clean deploy</goals>
<preparationGoals>clean verify</preparationGoals>
@@ -1155,13 +1157,6 @@
<extensions>true</extensions>
<inherited>true</inherited>
</plugin>
- <plugin>
- <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
- <artifactId>maven-java-formatter-plugin</artifactId>
- <configuration>
- <configFile>${project.basedir}/../contrib/Eclipse-Accumulo-Codestyle.xml</configFile>
- </configuration>
- </plugin>
</plugins>
<extensions>
<extension>
@@ -1309,6 +1304,26 @@
</build>
</profile>
<profile>
+ <!-- on by default, but disable with '-P !autoformat' or '-DskipFormat' -->
+ <id>autoformat</id>
+ <activation>
+ <property>
+ <name>!skipFormat</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
+ <artifactId>maven-java-formatter-plugin</artifactId>
+ <configuration>
+ <configFile>${eclipseFormatterStyle}</configFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<!-- 'mvn clean -P sortpom' sorts -->
<id>sortpom</id>
<build>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6771ff7d/server/base/pom.xml
----------------------------------------------------------------------
diff --git a/server/base/pom.xml b/server/base/pom.xml
index f52e2d3..94850b9 100644
--- a/server/base/pom.xml
+++ b/server/base/pom.xml
@@ -127,15 +127,6 @@
<directory>src/test/resources</directory>
</testResource>
</testResources>
- <plugins>
- <plugin>
- <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
- <artifactId>maven-java-formatter-plugin</artifactId>
- <configuration>
- <configFile>${project.basedir}/../../contrib/Eclipse-Accumulo-Codestyle.xml</configFile>
- </configuration>
- </plugin>
- </plugins>
</build>
<profiles>
<profile>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6771ff7d/server/gc/pom.xml
----------------------------------------------------------------------
diff --git a/server/gc/pom.xml b/server/gc/pom.xml
index 49d3fb5..694ffe9 100644
--- a/server/gc/pom.xml
+++ b/server/gc/pom.xml
@@ -87,15 +87,4 @@
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
- <artifactId>maven-java-formatter-plugin</artifactId>
- <configuration>
- <configFile>${project.basedir}/../../contrib/Eclipse-Accumulo-Codestyle.xml</configFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6771ff7d/server/master/pom.xml
----------------------------------------------------------------------
diff --git a/server/master/pom.xml b/server/master/pom.xml
index 0987ad1..cf92d4a 100644
--- a/server/master/pom.xml
+++ b/server/master/pom.xml
@@ -95,15 +95,4 @@
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
- <artifactId>maven-java-formatter-plugin</artifactId>
- <configuration>
- <configFile>${project.basedir}/../../contrib/Eclipse-Accumulo-Codestyle.xml</configFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6771ff7d/server/monitor/pom.xml
----------------------------------------------------------------------
diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml
index 75ec235..51262c1 100644
--- a/server/monitor/pom.xml
+++ b/server/monitor/pom.xml
@@ -143,14 +143,5 @@
</plugin>
</plugins>
</pluginManagement>
- <plugins>
- <plugin>
- <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
- <artifactId>maven-java-formatter-plugin</artifactId>
- <configuration>
- <configFile>${project.basedir}/../../contrib/Eclipse-Accumulo-Codestyle.xml</configFile>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6771ff7d/server/native/pom.xml
----------------------------------------------------------------------
diff --git a/server/native/pom.xml b/server/native/pom.xml
index f97d7c9..d175093 100644
--- a/server/native/pom.xml
+++ b/server/native/pom.xml
@@ -109,13 +109,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
- <artifactId>maven-java-formatter-plugin</artifactId>
- <configuration>
- <configFile>${project.basedir}/../../contrib/Eclipse-Accumulo-Codestyle.xml</configFile>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6771ff7d/server/tracer/pom.xml
----------------------------------------------------------------------
diff --git a/server/tracer/pom.xml b/server/tracer/pom.xml
index 020af61..c44f498 100644
--- a/server/tracer/pom.xml
+++ b/server/tracer/pom.xml
@@ -88,17 +88,6 @@
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
- <artifactId>maven-java-formatter-plugin</artifactId>
- <configuration>
- <configFile>${project.basedir}/../../contrib/Eclipse-Accumulo-Codestyle.xml</configFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
<profiles>
<profile>
<id>thrift</id>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6771ff7d/server/tserver/pom.xml
----------------------------------------------------------------------
diff --git a/server/tserver/pom.xml b/server/tserver/pom.xml
index 00a223f..a4bc3de 100644
--- a/server/tserver/pom.xml
+++ b/server/tserver/pom.xml
@@ -141,14 +141,5 @@
</plugin>
</plugins>
</pluginManagement>
- <plugins>
- <plugin>
- <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
- <artifactId>maven-java-formatter-plugin</artifactId>
- <configuration>
- <configFile>${project.basedir}/../../contrib/Eclipse-Accumulo-Codestyle.xml</configFile>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
[4/7] accumulo git commit: ACCUMULO-3781 Create autoformat profile
Posted by ct...@apache.org.
ACCUMULO-3781 Create autoformat profile
* Place maven-java-formatter-plugin in autoformat profile
* Enable skipping of profile with '-P !autoformat' or '-DskipFormat'
* Add '-P !autoformat' to release profile and maven-plugin invoked IT
* Simplify reference to config location using ${project.parent.basedir}
* Enable overriding formatter with '-DeclipseFormatterStyle=/some/absolute/path'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6771ff7d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6771ff7d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6771ff7d
Branch: refs/heads/master
Commit: 6771ff7d431915eb0ad19198c0d8d6edbce49d88
Parents: a8ef75e
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu May 7 16:51:01 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu May 7 17:42:52 2015 -0400
----------------------------------------------------------------------
examples/simple/pom.xml | 9 --------
maven-plugin/pom.xml | 3 +++
maven-plugin/src/it/plugin-test/pom.xml | 7 -------
pom.xml | 31 +++++++++++++++++++++-------
server/base/pom.xml | 9 --------
server/gc/pom.xml | 11 ----------
server/master/pom.xml | 11 ----------
server/monitor/pom.xml | 9 --------
server/native/pom.xml | 7 -------
server/tracer/pom.xml | 11 ----------
server/tserver/pom.xml | 9 --------
11 files changed, 26 insertions(+), 91 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6771ff7d/examples/simple/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple/pom.xml b/examples/simple/pom.xml
index e83bf45..aa2f118 100644
--- a/examples/simple/pom.xml
+++ b/examples/simple/pom.xml
@@ -113,14 +113,5 @@
</plugin>
</plugins>
</pluginManagement>
- <plugins>
- <plugin>
- <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
- <artifactId>maven-java-formatter-plugin</artifactId>
- <configuration>
- <configFile>${project.basedir}/../../contrib/Eclipse-Accumulo-Codestyle.xml</configFile>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6771ff7d/maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index d0b618e..2c07d7d 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -110,6 +110,9 @@
<goal>clean</goal>
<goal>post-integration-test</goal>
</goals>
+ <profiles>
+ <profile>!autoformat</profile>
+ </profiles>
</configuration>
<executions>
<execution>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6771ff7d/maven-plugin/src/it/plugin-test/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugin/src/it/plugin-test/pom.xml b/maven-plugin/src/it/plugin-test/pom.xml
index 8a848e4..7654c96 100644
--- a/maven-plugin/src/it/plugin-test/pom.xml
+++ b/maven-plugin/src/it/plugin-test/pom.xml
@@ -113,13 +113,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
- <artifactId>maven-java-formatter-plugin</artifactId>
- <configuration>
- <configFile>${project.basedir}/../../../../contrib/Eclipse-Accumulo-Codestyle.xml</configFile>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6771ff7d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cd20445..3188cac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,6 +119,8 @@
<accumulo.release.version>${project.version}</accumulo.release.version>
<!-- bouncycastle version for test dependencies -->
<bouncycastle.version>1.50</bouncycastle.version>
+ <!-- relative path for Eclipse format; should override in child modules if necessary -->
+ <eclipseFormatterStyle>${project.parent.basedir}/contrib/Eclipse-Accumulo-Codestyle.xml</eclipseFormatterStyle>
<!-- findbugs-maven-plugin won't work on jdk8 or later; set to 3.0.0 or newer -->
<findbugs.version>3.0.0</findbugs.version>
<!-- surefire/failsafe plugin option -->
@@ -643,7 +645,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
- <arguments>-P apache-release,thrift,assemble,docs,sunny -Dtimeout.factor=2</arguments>
+ <arguments>-P !autoformat,apache-release,thrift,assemble,docs,sunny -Dtimeout.factor=2</arguments>
<autoVersionSubmodules>true</autoVersionSubmodules>
<goals>clean deploy</goals>
<preparationGoals>clean verify</preparationGoals>
@@ -1155,13 +1157,6 @@
<extensions>true</extensions>
<inherited>true</inherited>
</plugin>
- <plugin>
- <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
- <artifactId>maven-java-formatter-plugin</artifactId>
- <configuration>
- <configFile>${project.basedir}/../contrib/Eclipse-Accumulo-Codestyle.xml</configFile>
- </configuration>
- </plugin>
</plugins>
<extensions>
<extension>
@@ -1309,6 +1304,26 @@
</build>
</profile>
<profile>
+ <!-- on by default, but disable with '-P !autoformat' or '-DskipFormat' -->
+ <id>autoformat</id>
+ <activation>
+ <property>
+ <name>!skipFormat</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
+ <artifactId>maven-java-formatter-plugin</artifactId>
+ <configuration>
+ <configFile>${eclipseFormatterStyle}</configFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<!-- 'mvn clean -P sortpom' sorts -->
<id>sortpom</id>
<build>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6771ff7d/server/base/pom.xml
----------------------------------------------------------------------
diff --git a/server/base/pom.xml b/server/base/pom.xml
index f52e2d3..94850b9 100644
--- a/server/base/pom.xml
+++ b/server/base/pom.xml
@@ -127,15 +127,6 @@
<directory>src/test/resources</directory>
</testResource>
</testResources>
- <plugins>
- <plugin>
- <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
- <artifactId>maven-java-formatter-plugin</artifactId>
- <configuration>
- <configFile>${project.basedir}/../../contrib/Eclipse-Accumulo-Codestyle.xml</configFile>
- </configuration>
- </plugin>
- </plugins>
</build>
<profiles>
<profile>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6771ff7d/server/gc/pom.xml
----------------------------------------------------------------------
diff --git a/server/gc/pom.xml b/server/gc/pom.xml
index 49d3fb5..694ffe9 100644
--- a/server/gc/pom.xml
+++ b/server/gc/pom.xml
@@ -87,15 +87,4 @@
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
- <artifactId>maven-java-formatter-plugin</artifactId>
- <configuration>
- <configFile>${project.basedir}/../../contrib/Eclipse-Accumulo-Codestyle.xml</configFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6771ff7d/server/master/pom.xml
----------------------------------------------------------------------
diff --git a/server/master/pom.xml b/server/master/pom.xml
index 0987ad1..cf92d4a 100644
--- a/server/master/pom.xml
+++ b/server/master/pom.xml
@@ -95,15 +95,4 @@
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
- <artifactId>maven-java-formatter-plugin</artifactId>
- <configuration>
- <configFile>${project.basedir}/../../contrib/Eclipse-Accumulo-Codestyle.xml</configFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6771ff7d/server/monitor/pom.xml
----------------------------------------------------------------------
diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml
index 75ec235..51262c1 100644
--- a/server/monitor/pom.xml
+++ b/server/monitor/pom.xml
@@ -143,14 +143,5 @@
</plugin>
</plugins>
</pluginManagement>
- <plugins>
- <plugin>
- <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
- <artifactId>maven-java-formatter-plugin</artifactId>
- <configuration>
- <configFile>${project.basedir}/../../contrib/Eclipse-Accumulo-Codestyle.xml</configFile>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6771ff7d/server/native/pom.xml
----------------------------------------------------------------------
diff --git a/server/native/pom.xml b/server/native/pom.xml
index f97d7c9..d175093 100644
--- a/server/native/pom.xml
+++ b/server/native/pom.xml
@@ -109,13 +109,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
- <artifactId>maven-java-formatter-plugin</artifactId>
- <configuration>
- <configFile>${project.basedir}/../../contrib/Eclipse-Accumulo-Codestyle.xml</configFile>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6771ff7d/server/tracer/pom.xml
----------------------------------------------------------------------
diff --git a/server/tracer/pom.xml b/server/tracer/pom.xml
index 020af61..c44f498 100644
--- a/server/tracer/pom.xml
+++ b/server/tracer/pom.xml
@@ -88,17 +88,6 @@
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
- <artifactId>maven-java-formatter-plugin</artifactId>
- <configuration>
- <configFile>${project.basedir}/../../contrib/Eclipse-Accumulo-Codestyle.xml</configFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
<profiles>
<profile>
<id>thrift</id>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6771ff7d/server/tserver/pom.xml
----------------------------------------------------------------------
diff --git a/server/tserver/pom.xml b/server/tserver/pom.xml
index 00a223f..a4bc3de 100644
--- a/server/tserver/pom.xml
+++ b/server/tserver/pom.xml
@@ -141,14 +141,5 @@
</plugin>
</plugins>
</pluginManagement>
- <plugins>
- <plugin>
- <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
- <artifactId>maven-java-formatter-plugin</artifactId>
- <configuration>
- <configFile>${project.basedir}/../../contrib/Eclipse-Accumulo-Codestyle.xml</configFile>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
[3/7] accumulo git commit: ACCUMULO-3782 Automatically run sortpom
Posted by ct...@apache.org.
ACCUMULO-3782 Automatically run sortpom
* Enable sortpom-maven-plugin by default in the autoformat profile.
* Verify pom sort after sorting.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6d8f47c3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6d8f47c3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6d8f47c3
Branch: refs/heads/master
Commit: 6d8f47c35285c7f76d2cc84db01719a19008ce31
Parents: 6771ff7
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu May 7 17:10:59 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu May 7 17:42:52 2015 -0400
----------------------------------------------------------------------
pom.xml | 30 ++++++++++++------------------
1 file changed, 12 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6d8f47c3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3188cac..3aaff0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -547,6 +547,7 @@
<version>2.4.0</version>
<configuration>
<predefinedSortOrder>recommended_2008_06</predefinedSortOrder>
+ <createBackupFile>false</createBackupFile>
<lineSeparator>\n</lineSeparator>
<expandEmptyElements>false</expandEmptyElements>
<nrOfIndentSpace>2</nrOfIndentSpace>
@@ -862,6 +863,7 @@
<artifactId>sortpom-maven-plugin</artifactId>
<versionRange>[2.4.0,)</versionRange>
<goals>
+ <goal>sort</goal>
<goal>verify</goal>
</goals>
</pluginExecutionFilter>
@@ -954,7 +956,7 @@
</pluginManagement>
<plugins>
<plugin>
- <!-- verify only; 'mvn clean -P sortpom' sorts -->
+ <!-- verify before compile; should be sorted already -->
<groupId>com.github.ekryd.sortpom</groupId>
<artifactId>sortpom-maven-plugin</artifactId>
<executions>
@@ -963,7 +965,7 @@
<goals>
<goal>verify</goal>
</goals>
- <phase>validate</phase>
+ <phase>process-resources</phase>
</execution>
</executions>
</plugin>
@@ -1314,21 +1316,6 @@
<build>
<plugins>
<plugin>
- <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
- <artifactId>maven-java-formatter-plugin</artifactId>
- <configuration>
- <configFile>${eclipseFormatterStyle}</configFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <!-- 'mvn clean -P sortpom' sorts -->
- <id>sortpom</id>
- <build>
- <plugins>
- <plugin>
<groupId>com.github.ekryd.sortpom</groupId>
<artifactId>sortpom-maven-plugin</artifactId>
<executions>
@@ -1337,10 +1324,17 @@
<goals>
<goal>sort</goal>
</goals>
- <phase>clean</phase>
+ <phase>process-sources</phase>
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
+ <artifactId>maven-java-formatter-plugin</artifactId>
+ <configuration>
+ <configFile>${eclipseFormatterStyle}</configFile>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>