Repository: incubator-htrace Updated Branches: refs/heads/master 7676c37bb -> 971365f11
HTRACE-82. Add profile to pom to use maven-assembly-plugin for both src tarball and fat jars (iwasakims) Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/971365f1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/971365f1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/971365f1 Branch: refs/heads/master Commit: 971365f119e57cc1d21a2ac5777fafffbb8993f4 Parents: 7676c37 Author: Masatake Iwasaki <[email protected]> Authored: Fri Jan 23 11:05:52 2015 +0900 Committer: Masatake Iwasaki <[email protected]> Committed: Fri Jan 23 11:05:52 2015 +0900 ---------------------------------------------------------------------- BUILDING.txt | 2 +- htrace-core/pom.xml | 24 +++++++++++++++++------- htrace-flume/pom.xml | 19 +++++++++++++++++-- htrace-hbase/pom.xml | 15 ++++++++++++++- htrace-zipkin/pom.xml | 20 ++++++++++++++++++-- pom.xml | 39 ++++++++++++++++++++++++++------------- 6 files changed, 93 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/971365f1/BUILDING.txt ---------------------------------------------------------------------- diff --git a/BUILDING.txt b/BUILDING.txt index 11213b8..03ab4f7 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -10,7 +10,7 @@ After installing go, to build, run: To build a tarball, do: - $ mvn clean install -DskipTests assembly:single + $ mvn clean install -DskipTests assembly:single -Pdist This will build a tarball into ./target. http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/971365f1/htrace-core/pom.xml ---------------------------------------------------------------------- diff --git a/htrace-core/pom.xml b/htrace-core/pom.xml index c293f6f..bbc3de8 100644 --- a/htrace-core/pom.xml +++ b/htrace-core/pom.xml @@ -32,13 +32,6 @@ language governing permissions and limitations under the License. --> <build> <plugins> <plugin> - <!--Make it so assembly:single does nothing in here--> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <skipAssembly>true</skipAssembly> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> @@ -159,4 +152,21 @@ language governing permissions and limitations under the License. --> <artifactId>commons-logging</artifactId> </dependency> </dependencies> + + <profiles> + <profile> + <id>dist</id> + <build> + <plugins> + <plugin> + <!--Make it so assembly:single does nothing in here--> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <skipAssembly>true</skipAssembly> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/971365f1/htrace-flume/pom.xml ---------------------------------------------------------------------- diff --git a/htrace-flume/pom.xml b/htrace-flume/pom.xml index 227f442..6de3605 100644 --- a/htrace-flume/pom.xml +++ b/htrace-flume/pom.xml @@ -34,10 +34,8 @@ language governing permissions and limitations under the License. --> <build> <plugins> <plugin> - <!--Make it so assembly:single does nothing in here--> <artifactId>maven-assembly-plugin</artifactId> <configuration> - <skipAssembly>true</skipAssembly> <descriptorRefs> <descriptorRef>jar-with-dependencies</descriptorRef> </descriptorRefs> @@ -108,4 +106,21 @@ language governing permissions and limitations under the License. --> <scope>test</scope> </dependency> </dependencies> + + <profiles> + <profile> + <id>dist</id> + <build> + <plugins> + <plugin> + <!--Make it so assembly:single does nothing in here--> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <skipAssembly>true</skipAssembly> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/971365f1/htrace-hbase/pom.xml ---------------------------------------------------------------------- diff --git a/htrace-hbase/pom.xml b/htrace-hbase/pom.xml index dbdbed6..fb976ee 100644 --- a/htrace-hbase/pom.xml +++ b/htrace-hbase/pom.xml @@ -52,7 +52,6 @@ language governing permissions and limitations under the License. --> <!--Make it so assembly:single does nothing in here--> <artifactId>maven-assembly-plugin</artifactId> <configuration> - <skipAssembly>true</skipAssembly> <descriptorRefs> <descriptorRef>jar-with-dependencies</descriptorRef> </descriptorRefs> @@ -189,6 +188,20 @@ language governing permissions and limitations under the License. --> </plugins> </build> </profile> + <profile> + <id>dist</id> + <build> + <plugins> + <plugin> + <!--Make it so assembly:single does nothing in here--> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <skipAssembly>true</skipAssembly> + </configuration> + </plugin> + </plugins> + </build> + </profile> </profiles> </project> http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/971365f1/htrace-zipkin/pom.xml ---------------------------------------------------------------------- diff --git a/htrace-zipkin/pom.xml b/htrace-zipkin/pom.xml index c3760c7..0e2ae64 100644 --- a/htrace-zipkin/pom.xml +++ b/htrace-zipkin/pom.xml @@ -32,10 +32,8 @@ language governing permissions and limitations under the License. --> <build> <plugins> <plugin> - <!--Make it so assembly:single does nothing in here--> <artifactId>maven-assembly-plugin</artifactId> <configuration> - <skipAssembly>true</skipAssembly> <descriptorRefs> <descriptorRef>jar-with-dependencies</descriptorRef> </descriptorRefs> @@ -102,4 +100,22 @@ language governing permissions and limitations under the License. --> <version>1.7</version> </dependency> </dependencies> + + <profiles> + <profile> + <id>dist</id> + <build> + <plugins> + <plugin> + <!--Make it so assembly:single does nothing in here--> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <skipAssembly>true</skipAssembly> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> + </project> http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/971365f1/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b5ca583..a3175ab 100644 --- a/pom.xml +++ b/pom.xml @@ -218,6 +218,10 @@ language governing permissions and limitations under the License. --> <artifactId>maven-shade-plugin</artifactId> <version>2.1</version> </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.5.3</version> + </plugin> </plugins> </pluginManagement> <plugins> @@ -264,19 +268,6 @@ language governing permissions and limitations under the License. --> </configuration> </plugin> <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.5.3</version> - <configuration> - <!--Do not attach assembly to project.--> - <attach>false</attach> - <tarLongFileMode>gnu</tarLongFileMode> - <finalName>htrace-${project.version}</finalName> - <descriptors> - <descriptor>src/main/assembly/src.xml</descriptor> - </descriptors> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> @@ -332,4 +323,26 @@ language governing permissions and limitations under the License. --> <url>file:///tmp</url> </site> </distributionManagement> + + <profiles> + <profile> + <id>dist</id> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <!--Do not attach assembly to project.--> + <attach>false</attach> + <tarLongFileMode>gnu</tarLongFileMode> + <finalName>htrace-${project.version}</finalName> + <descriptors> + <descriptor>src/main/assembly/src.xml</descriptor> + </descriptors> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project>
