bookkeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eolive...@apache.org
Subject [bookkeeper] branch master updated: ISSUE #499: make a package contains all the jar
Date Wed, 20 Sep 2017 14:37:14 GMT
This is an automated email from the ASF dual-hosted git repository.

eolivelli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


The following commit(s) were added to refs/heads/master by this push:
     new 31bef62  ISSUE #499: make a package contains all the jar
31bef62 is described below

commit 31bef62d7e63d5a8b198dd09ca2e72646a6bffc8
Author: Jia Zhai <zhaijia@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 <zhaijia@apache.org>
    
    Reviewers: Enrico Olivelli <eolivelli@apache.org>
    
    This closes #500 from zhaijack/all_bin, closes #499
---
 bookkeeper-benchmark/pom.xml                       |   2 +-
 bookkeeper-dist/pom.xml                            | 127 +++++++++++++++++++++
 bookkeeper-server/conf/bk_server.conf              |   2 +-
 bookkeeper-server/pom.xml                          |   2 +-
 pom.xml                                            |   4 +-
 src/assemble/bin.xml                               |  10 +-
 .../src => src}/main/resources/LICENSE.bin.txt     |   0
 .../src => src}/main/resources/NOTICE.bin.txt      |   2 +-
 8 files changed, 140 insertions(+), 9 deletions(-)

diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml
index 488fd70..35cf238 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..53e831c
--- /dev/null
+++ b/bookkeeper-dist/pom.xml
@@ -0,0 +1,127 @@
+<!--
+
+    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.6.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>
+
+        <!-- bookkeeper.http -->
+        <dependency>
+            <groupId>org.apache.bookkeeper.http</groupId>
+            <artifactId>http-server</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.bookkeeper.http</groupId>
+            <artifactId>twitter-http-server</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.bookkeeper.http</groupId>
+            <artifactId>vertx-http-server</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>
\ No newline at end of file
diff --git a/bookkeeper-server/conf/bk_server.conf b/bookkeeper-server/conf/bk_server.conf
index 1bf3754..0a290d7 100755
--- a/bookkeeper-server/conf/bk_server.conf
+++ b/bookkeeper-server/conf/bk_server.conf
@@ -470,7 +470,7 @@ ledgerManagerFactoryClass=org.apache.bookkeeper.meta.HierarchicalLedgerManagerFa
 # 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 8fa96e5..266685a 100644
--- a/bookkeeper-server/pom.xml
+++ b/bookkeeper-server/pom.xml
@@ -278,7 +278,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 f8ecc0c..9879022 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,6 +59,7 @@
     <module>bookkeeper-stats-providers</module>
     <module>bookkeeper-http</module>
     <module>tests</module>
+    <module>bookkeeper-dist</module>
   </modules>
   <mailingLists>
     <mailingList>
@@ -119,6 +120,7 @@
     <maven-shade-plugin.version>2.4.3</maven-shade-plugin.version>
     <maven-source-plugin.version>2.2.1</maven-source-plugin.version>
     <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
+    <maven-assembly-plugin.version>2.2.1</maven-assembly-plugin.version>
   </properties>
 
   <!-- dependencies for all modules -->
@@ -255,7 +257,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" <commits@bookkeeper.apache.org>'].

Mime
View raw message