You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by si...@apache.org on 2017/10/04 07:52:17 UTC
[bookkeeper] 04/06: ISSUE #499: make a package contains all the jar
This is an automated email from the ASF dual-hosted git repository.
sijie pushed a commit to branch branch-4.5
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
commit 20b360a3530d8a377169bf0740785d422d6e5181
Author: Jia Zhai <zh...@apache.org>
AuthorDate: Wed Sep 20 16:36:39 2017 +0200
ISSUE #499: make a package contains all the jar
Descriptions of the changes in this PR:
This is a sub-task for #458:
Make Prometheus provider the default in bk_server.conf,
Include stats providers in a -all package,
Author: Jia Zhai <zh...@apache.org>
Reviewers: Enrico Olivelli <eo...@apache.org>
This closes #500 from zhaijack/all_bin, closes #499
---
bookkeeper-benchmark/pom.xml | 2 +-
bookkeeper-dist/pom.xml | 110 +++++++++++++++++++++
bookkeeper-server/conf/bk_server.conf | 2 +-
bookkeeper-server/pom.xml | 2 +-
pom.xml | 6 +-
src/assemble/bin.xml | 10 +-
.../src => src}/main/resources/LICENSE.bin.txt | 0
.../src => src}/main/resources/NOTICE.bin.txt | 2 +-
8 files changed, 125 insertions(+), 9 deletions(-)
diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml
index 1b614c2..beebbbf 100644
--- a/bookkeeper-benchmark/pom.xml
+++ b/bookkeeper-benchmark/pom.xml
@@ -33,7 +33,7 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.1</version>
+ <version>${maven-assembly-plugin.version}</version>
<configuration>
<skipAssembly>true</skipAssembly>
</configuration>
diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml
new file mode 100644
index 0000000..61ec904
--- /dev/null
+++ b/bookkeeper-dist/pom.xml
@@ -0,0 +1,110 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>bookkeeper</artifactId>
+ <groupId>org.apache.bookkeeper</groupId>
+ <version>4.5.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <artifactId>bookkeeper-dist</artifactId>
+ <packaging>jar</packaging>
+ <name>Apache BookKeeper :: Dist</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.bookkeeper</groupId>
+ <artifactId>bookkeeper-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- bookkeeper.stats -->
+ <dependency>
+ <groupId>org.apache.bookkeeper.stats</groupId>
+ <artifactId>bookkeeper-stats-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.bookkeeper.stats</groupId>
+ <artifactId>codahale-metrics-provider</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.bookkeeper.stats</groupId>
+ <artifactId>prometheus-metrics-provider</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.bookkeeper.stats</groupId>
+ <artifactId>twitter-finagle-provider</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.bookkeeper</groupId>
+ <artifactId>bookkeeper-benchmark</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- slf4j binding -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven-assembly-plugin.version}</version>
+ <configuration>
+ <descriptors>
+ <descriptor>../src/assemble/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- skip deploying this artifact, since this module is used for generating an uber package-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>${maven-deploy-plugin.version}</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+</project>
diff --git a/bookkeeper-server/conf/bk_server.conf b/bookkeeper-server/conf/bk_server.conf
index d3667b2..165530c 100755
--- a/bookkeeper-server/conf/bk_server.conf
+++ b/bookkeeper-server/conf/bk_server.conf
@@ -467,7 +467,7 @@ ledgerDirectories=/tmp/bk-data
# enableStatistics=true
# Stats Provider Class (if statistics are enabled)
-#statsProviderClass=org.apache.bookkeeper.stats.CodahaleMetricsProvider
+statsProviderClass=org.apache.bookkeeper.stats.PrometheusMetricsProvider
#############################################################################
## Read-only mode support
diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml
index 10db7ce..078c1b1 100644
--- a/bookkeeper-server/pom.xml
+++ b/bookkeeper-server/pom.xml
@@ -304,7 +304,7 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.1</version>
+ <version>${maven-assembly-plugin.version}</version>
<configuration>
<descriptors>
<descriptor>../src/assemble/bin.xml</descriptor>
diff --git a/pom.xml b/pom.xml
index c5fddda..b2df8c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,6 +57,7 @@
<module>bookkeeper-server</module>
<module>bookkeeper-benchmark</module>
<module>bookkeeper-stats-providers</module>
+ <module>bookkeeper-dist</module>
</modules>
<mailingLists>
<mailingList>
@@ -105,9 +106,12 @@
<!-- plugin dependencies -->
<findbugs-maven-plugin.version>3.0.4</findbugs-maven-plugin.version>
<puppycrawl.checkstyle.version>6.19</puppycrawl.checkstyle.version>
+ <maven-assembly-plugin.version>2.2.1</maven-assembly-plugin.version>
<maven-checkstyle-plugin.version>2.17</maven-checkstyle-plugin.version>
+ <maven-deploy-plugin.version>2.7</maven-deploy-plugin.version>
<maven-javadoc-plugin.version>2.10.4</maven-javadoc-plugin.version>
<maven-source-plugin.version>2.2.1</maven-source-plugin.version>
+ <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
</properties>
<!-- dependencies for all modules -->
@@ -230,7 +234,7 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.1</version>
+ <version>${maven-assembly-plugin.version}</version>
<configuration>
<tarLongFileMode>gnu</tarLongFileMode>
<descriptors>
diff --git a/src/assemble/bin.xml b/src/assemble/bin.xml
index 99a766c..9f15874 100644
--- a/src/assemble/bin.xml
+++ b/src/assemble/bin.xml
@@ -31,11 +31,13 @@
</includes>
</fileSet>
<fileSet>
- <directory>conf</directory>
+ <directory>../bookkeeper-server/conf</directory>
+ <outputDirectory>/conf</outputDirectory>
</fileSet>
<fileSet>
- <directory>bin</directory>
+ <directory>../bookkeeper-server/bin</directory>
<fileMode>755</fileMode>
+ <outputDirectory>/bin</outputDirectory>
</fileSet>
<fileSet>
<fileMode>644</fileMode>
@@ -51,13 +53,13 @@
<fileMode>644</fileMode>
</file>
<file>
- <source>${basedir}/src/main/resources/LICENSE.bin.txt</source>
+ <source>../src/main/resources/LICENSE.bin.txt</source>
<outputDirectory>/</outputDirectory>
<destName>LICENSE</destName>
<fileMode>644</fileMode>
</file>
<file>
- <source>${basedir}/src/main/resources/NOTICE.bin.txt</source>
+ <source>../src/main/resources//NOTICE.bin.txt</source>
<outputDirectory>/</outputDirectory>
<destName>NOTICE</destName>
<fileMode>644</fileMode>
diff --git a/bookkeeper-server/src/main/resources/LICENSE.bin.txt b/src/main/resources/LICENSE.bin.txt
similarity index 100%
rename from bookkeeper-server/src/main/resources/LICENSE.bin.txt
rename to src/main/resources/LICENSE.bin.txt
diff --git a/bookkeeper-server/src/main/resources/NOTICE.bin.txt b/src/main/resources/NOTICE.bin.txt
similarity index 96%
rename from bookkeeper-server/src/main/resources/NOTICE.bin.txt
rename to src/main/resources/NOTICE.bin.txt
index 3d398db..2fb0ab0 100644
--- a/bookkeeper-server/src/main/resources/NOTICE.bin.txt
+++ b/src/main/resources/NOTICE.bin.txt
@@ -1,5 +1,5 @@
Apache BookKeeper
-Copyright 2011-2015 The Apache Software Foundation
+Copyright 2011-2017 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
--
To stop receiving notification emails like this one, please contact
"commits@bookkeeper.apache.org" <co...@bookkeeper.apache.org>.