This is an automated email from the ASF dual-hosted git repository.
zhaijia 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 e086f1d ISSUE #688: add bookkeeper-all package and update notice files
e086f1d is described below
commit e086f1dec6af8120e692862f29c2f77565760025
Author: Sijie Guo <[email protected]>
AuthorDate: Wed Nov 22 10:02:19 2017 +0800
ISSUE #688: add bookkeeper-all package and update notice files
Descriptions of the changes in this PR:
- move src/ to bookkeeper-dist/src/
- built two packages in bookkeeper-dist: one is `bookkeeper-server` -
server only package with prometheus stats provider and vertx http server,
the other one is `bookkeeper-all` - includes all packages.
- remove assembly plugin from bookkeeper-server module
- update release guide
Author: Sijie Guo <[email protected]>
Reviewers: Enrico Olivelli <[email protected]>, Jia Zhai <None>
This closes #737 from sijie/add_slim_module, closes #688
---
bookkeeper-benchmark/pom.xml | 7 -
bookkeeper-dist/all/pom.xml | 128 ++++++++++++++
bookkeeper-dist/pom.xml | 194 ++++++++-------------
bookkeeper-dist/server/pom.xml | 107 ++++++++++++
.../src/assemble/bin-all.xml | 32 +++-
.../src/assemble/bin-server.xml | 26 ++-
{src => bookkeeper-dist/src}/assemble/src.xml | 12 +-
.../src}/main/resources/LICENSE.bin.txt | 37 ----
.../src/main/resources/NOTICE-all.bin.txt | 19 +-
.../src/main/resources/NOTICE-server.bin.txt | 14 +-
bookkeeper-server/bin/bookkeeper | 13 +-
bookkeeper-server/pom.xml | 17 --
site/community/release_guide.md | 12 +-
13 files changed, 407 insertions(+), 211 deletions(-)
diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml
index b9cb781..01c7bbb 100644
--- a/bookkeeper-benchmark/pom.xml
+++ b/bookkeeper-benchmark/pom.xml
@@ -32,13 +32,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${maven-assembly-plugin.version}</version>
- <configuration>
- <skipAssembly>true</skipAssembly>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml
new file mode 100644
index 0000000..ac4be99
--- /dev/null
+++ b/bookkeeper-dist/all/pom.xml
@@ -0,0 +1,128 @@
+<!--
+
+ 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-dist</artifactId>
+ <groupId>org.apache.bookkeeper</groupId>
+ <version>4.6.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <artifactId>bookkeeper-dist-all</artifactId>
+ <packaging>jar</packaging>
+ <name>Apache BookKeeper :: Dist (All)</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>
+ <finalName>bookkeeper-all-${project.version}</finalName>
+ <attach>false</attach>
+ <descriptors>
+ <descriptor>../src/assemble/bin-all.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-dist/pom.xml b/bookkeeper-dist/pom.xml
index 53e831c..f93be13 100644
--- a/bookkeeper-dist/pom.xml
+++ b/bookkeeper-dist/pom.xml
@@ -1,127 +1,77 @@
<!--
+ 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
- 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.
+ 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
+<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/xsd/maven-4.0.0.xsd";>
+ <parent>
+ <artifactId>bookkeeper</artifactId>
+ <groupId>org.apache.bookkeeper</groupId>
+ <version>4.6.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>bookkeeper-dist</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache BookKeeper :: Dist (Parent)</name>
+ <modules>
+ <module>all</module>
+ <module>server</module>
+ </modules>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>${maven-jar-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>default-jar</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven-assembly-plugin.version}</version>
+ <configuration>
+ <finalName>bookkeeper-${project.version}</finalName>
+ <descriptors>
+ <descriptor>src/assemble/src.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-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml
new file mode 100644
index 0000000..e46e994
--- /dev/null
+++ b/bookkeeper-dist/server/pom.xml
@@ -0,0 +1,107 @@
+<!--
+
+ 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-dist</artifactId>
+ <groupId>org.apache.bookkeeper</groupId>
+ <version>4.6.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <artifactId>bookkeeper-dist-server</artifactId>
+ <packaging>jar</packaging>
+ <name>Apache BookKeeper :: Dist (Server)</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>prometheus-metrics-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>vertx-http-server</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>
+ <finalName>bookkeeper-server-${project.version}</finalName>
+ <attach>false</attach>
+ <descriptors>
+ <descriptor>../src/assemble/bin-server.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/src/assemble/bin.xml b/bookkeeper-dist/src/assemble/bin-all.xml
similarity index 61%
copy from src/assemble/bin.xml
copy to bookkeeper-dist/src/assemble/bin-all.xml
index 9f15874..0ce1afa 100644
--- a/src/assemble/bin.xml
+++ b/bookkeeper-dist/src/assemble/bin-all.xml
@@ -31,11 +31,16 @@
</includes>
</fileSet>
<fileSet>
- <directory>../bookkeeper-server/conf</directory>
+ <directory>../../bookkeeper-server/conf</directory>
<outputDirectory>/conf</outputDirectory>
</fileSet>
<fileSet>
- <directory>../bookkeeper-server/bin</directory>
+ <directory>../../bookkeeper-server/bin</directory>
+ <fileMode>755</fileMode>
+ <outputDirectory>/bin</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../../bookkeeper-benchmark/bin</directory>
<fileMode>755</fileMode>
<outputDirectory>/bin</outputDirectory>
</fileSet>
@@ -48,7 +53,7 @@
</fileSets>
<files>
<file>
- <source>../README.md</source>
+ <source>../../README.md</source>
<outputDirectory>/</outputDirectory>
<fileMode>644</fileMode>
</file>
@@ -59,7 +64,7 @@
<fileMode>644</fileMode>
</file>
<file>
- <source>../src/main/resources//NOTICE.bin.txt</source>
+ <source>../src/main/resources//NOTICE-all.bin.txt</source>
<outputDirectory>/</outputDirectory>
<destName>NOTICE</destName>
<fileMode>644</fileMode>
@@ -71,6 +76,25 @@
<unpack>false</unpack>
<scope>runtime</scope>
<useProjectArtifact>false</useProjectArtifact>
+ <!-- Include 'groupId' in the dependencies Jar names to better identify
the provenance of the jar -->
+
<outputFileNameMapping>${artifact.groupId}-${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <excludes>
+ <!-- All these dependencies are already included in netty-all -->
+ <exclude>io.netty:netty-buffer</exclude>
+ <exclude>io.netty:netty-codec</exclude>
+ <exclude>io.netty:netty-codec-dns</exclude>
+ <exclude>io.netty:netty-codec-http</exclude>
+ <exclude>io.netty:netty-codec-http2</exclude>
+ <exclude>io.netty:netty-codec-socks</exclude>
+ <exclude>io.netty:netty-common</exclude>
+ <exclude>io.netty:netty-handler</exclude>
+ <exclude>io.netty:netty-handler-proxy</exclude>
+ <exclude>io.netty:netty-resolver</exclude>
+ <exclude>io.netty:netty-resolver-dns</exclude>
+ <exclude>io.netty:netty-tcnative-boringssl-static</exclude>
+ <exclude>io.netty:netty-transport-native-epoll</exclude>
+ <exclude>io.netty:netty-transport</exclude>
+ </excludes>
</dependencySet>
</dependencySets>
</assembly>
diff --git a/src/assemble/bin.xml b/bookkeeper-dist/src/assemble/bin-server.xml
similarity index 65%
rename from src/assemble/bin.xml
rename to bookkeeper-dist/src/assemble/bin-server.xml
index 9f15874..7c610fa 100644
--- a/src/assemble/bin.xml
+++ b/bookkeeper-dist/src/assemble/bin-server.xml
@@ -31,11 +31,11 @@
</includes>
</fileSet>
<fileSet>
- <directory>../bookkeeper-server/conf</directory>
+ <directory>../../bookkeeper-server/conf</directory>
<outputDirectory>/conf</outputDirectory>
</fileSet>
<fileSet>
- <directory>../bookkeeper-server/bin</directory>
+ <directory>../../bookkeeper-server/bin</directory>
<fileMode>755</fileMode>
<outputDirectory>/bin</outputDirectory>
</fileSet>
@@ -48,7 +48,7 @@
</fileSets>
<files>
<file>
- <source>../README.md</source>
+ <source>../../README.md</source>
<outputDirectory>/</outputDirectory>
<fileMode>644</fileMode>
</file>
@@ -59,7 +59,7 @@
<fileMode>644</fileMode>
</file>
<file>
- <source>../src/main/resources//NOTICE.bin.txt</source>
+ <source>../src/main/resources//NOTICE-server.bin.txt</source>
<outputDirectory>/</outputDirectory>
<destName>NOTICE</destName>
<fileMode>644</fileMode>
@@ -71,6 +71,24 @@
<unpack>false</unpack>
<scope>runtime</scope>
<useProjectArtifact>false</useProjectArtifact>
+ <!-- Include 'groupId' in the dependencies Jar names to better identify
the provenance of the jar -->
+
<outputFileNameMapping>${artifact.groupId}-${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <excludes>
+ <!-- All these dependencies are already included in netty-all -->
+ <exclude>io.netty:netty-buffer</exclude>
+ <exclude>io.netty:netty-codec</exclude>
+ <exclude>io.netty:netty-codec-dns</exclude>
+ <exclude>io.netty:netty-codec-http</exclude>
+ <exclude>io.netty:netty-codec-http2</exclude>
+ <exclude>io.netty:netty-codec-socks</exclude>
+ <exclude>io.netty:netty-common</exclude>
+ <exclude>io.netty:netty-handler</exclude>
+ <exclude>io.netty:netty-handler-proxy</exclude>
+ <exclude>io.netty:netty-resolver</exclude>
+ <exclude>io.netty:netty-resolver-dns</exclude>
+ <exclude>io.netty:netty-tcnative-boringssl-static</exclude>
+ <exclude>io.netty:netty-transport</exclude>
+ </excludes>
</dependencySet>
</dependencySets>
</assembly>
diff --git a/src/assemble/src.xml b/bookkeeper-dist/src/assemble/src.xml
similarity index 88%
rename from src/assemble/src.xml
rename to bookkeeper-dist/src/assemble/src.xml
index 7031e06..9d63cf2 100644
--- a/src/assemble/src.xml
+++ b/bookkeeper-dist/src/assemble/src.xml
@@ -24,7 +24,7 @@
<includeBaseDirectory>true</includeBaseDirectory>
<fileSets>
<fileSet>
- <directory>.</directory>
+ <directory>..</directory>
<useDefaultExcludes>true</useDefaultExcludes>
<includes>
<include>**/README.md</include>
@@ -35,7 +35,9 @@
<include>**/conf/**</include>
<include>**/bin/**</include>
<include>**/*.txt</include>
- <include>doc/*</include>
+ <include>deploy/**</include>
+ <include>doc/**</include>
+ <include>docker/**</include>
</includes>
<excludes>
<exclude>.git/**</exclude>
@@ -53,6 +55,12 @@
<exclude>**/build/**</exclude>
<exclude>**/file:/**</exclude>
<exclude>**/SecurityAuth.audit*</exclude>
+ <!-- dev -->
+ <exclude>dev/**</exclude>
+ <!-- site -->
+ <exclude>site/**</exclude>
+ <!-- jenkins -->
+ <exclude>jenkins/**</exclude>
</excludes>
</fileSet>
<fileSet>
diff --git a/src/main/resources/LICENSE.bin.txt
b/bookkeeper-dist/src/main/resources/LICENSE.bin.txt
similarity index 90%
rename from src/main/resources/LICENSE.bin.txt
rename to bookkeeper-dist/src/main/resources/LICENSE.bin.txt
index 1299434..4b79c37 100644
--- a/src/main/resources/LICENSE.bin.txt
+++ b/bookkeeper-dist/src/main/resources/LICENSE.bin.txt
@@ -263,40 +263,3 @@ of the input file used when generating it. This code is
not
standalone and requires a support library to be linked with it. This
support library is itself covered by the above license.
-------------------------------------------------------------------------------------
-For lib/jline-*.jar
-
-Copyright (c) 2002-2006, Marc Prud'hommeaux <[email protected]>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or
-without modification, are permitted provided that the following
-conditions are met:
-
-Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with
-the distribution.
-
-Neither the name of JLine nor the names of its contributors
-may be used to endorse or promote products derived from this
-software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
diff --git a/src/main/resources/NOTICE.bin.txt
b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt
similarity index 68%
copy from src/main/resources/NOTICE.bin.txt
copy to bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt
index ae38397..fe1c18b 100644
--- a/src/main/resources/NOTICE.bin.txt
+++ b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt
@@ -16,6 +16,7 @@ under the License.
This project includes:
Apache Log4j under The Apache Software License, Version 2.0
+ Caffeine under The Apache Software License, Version 2.0
Commons BeanUtils Core under The Apache Software License, Version 2.0
Commons CLI under The Apache Software License, Version 2.0
Commons Codec under The Apache Software License, Version 2.0
@@ -24,12 +25,20 @@ This project includes:
Commons IO under The Apache Software License, Version 2.0
Commons Lang under The Apache Software License, Version 2.0
Commons Logging under The Apache Software License, Version 2.0
- commons Beanutils under Apache License, Version 2.0
+ Commons Beanutils under Apache License, Version 2.0
Commons Digester under The Apache Software License, Version 2.0
- Java Native Access under Apache License, Version 2.0
+ Dropwizard Metrics under The Apache Software License, Version 2.0
+ Guava under The Apache Software License, Version 2.0
+ Jackson under The Apache Software License, Version 2.0
+ Java Native Access under The Apache Software License, Version 2.0
+ Jetty under The Apache Software License, Version 2.0
+ Prometheus under The Apache Software License, Version 2.0
+ Protocol Buffer Java API under New BSD license
+ Scala under New BSD license
SLF4J API Module under MIT License
SLF4J LOG4J-12 Binding under MIT License
- The Netty Project under Apache License, Version 2.0
+ The Netty Project under The Apache Software License, Version 2.0
+ Twitter Finagle under The Apache Software License, Version 2.0
+ Twitter Util under The Apache Software License, Version 2.0
+ Vertx under The Apache Software License, Version 2.0
ZooKeeper under Apache License, Version 2.0
- Protocol Buffer Java API under New BSD license
- Guava under The Apache Software License, Version 2.0
diff --git a/src/main/resources/NOTICE.bin.txt
b/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt
similarity index 78%
rename from src/main/resources/NOTICE.bin.txt
rename to bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt
index ae38397..7c3654e 100644
--- a/src/main/resources/NOTICE.bin.txt
+++ b/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt
@@ -24,12 +24,16 @@ This project includes:
Commons IO under The Apache Software License, Version 2.0
Commons Lang under The Apache Software License, Version 2.0
Commons Logging under The Apache Software License, Version 2.0
- commons Beanutils under Apache License, Version 2.0
+ Commons Beanutils under Apache License, Version 2.0
Commons Digester under The Apache Software License, Version 2.0
- Java Native Access under Apache License, Version 2.0
+ Guava under The Apache Software License, Version 2.0
+ Jackson under The Apache Software License, Version 2.0
+ Java Native Access under The Apache Software License, Version 2.0
+ Jetty under The Apache Software License, Version 2.0
+ Prometheus under The Apache Software License, Version 2.0
+ Protocol Buffer Java API under New BSD license
SLF4J API Module under MIT License
SLF4J LOG4J-12 Binding under MIT License
- The Netty Project under Apache License, Version 2.0
+ The Netty Project under The Apache Software License, Version 2.0
+ Vertx under The Apache Software License, Version 2.0
ZooKeeper under Apache License, Version 2.0
- Protocol Buffer Java API under New BSD license
- Guava under The Apache Software License, Version 2.0
diff --git a/bookkeeper-server/bin/bookkeeper b/bookkeeper-server/bin/bookkeeper
index 260ebd6..a6a5806 100755
--- a/bookkeeper-server/bin/bookkeeper
+++ b/bookkeeper-server/bin/bookkeeper
@@ -71,13 +71,18 @@ else
fi
# exclude tests jar
-RELEASE_JAR=$(ls ${BK_HOME}/bookkeeper-server-*.jar 2> /dev/null | grep -v
tests | tail -1)
+RELEASE_JAR=$(ls ${BK_HOME}/*bookkeeper-server-*.jar 2> /dev/null | grep -v
tests | tail -1)
if [ -n "${RELEASE_JAR}" ]; then
- BOOKIE_JAR=$RELEASE_JAR
+ BOOKIE_JAR=${RELEASE_JAR}
+else
+ RELEASE_JAR=$(ls ${BK_HOME}/lib/*bookkeeper-server-*.jar 2> /dev/null | grep
-v tests | tail -1)
+ if [ -n "${RELEASE_JAR}" ]; then
+ BOOKIE_JAR=${RELEASE_JAR}
+ fi
fi
# exclude tests jar
-BUILT_JAR=$(ls ${BK_HOME}/target/bookkeeper-server-*.jar 2> /dev/null | grep
-v tests | tail -1)
+BUILT_JAR=$(ls ${BK_HOME}/target/*bookkeeper-server-*.jar 2> /dev/null | grep
-v tests | tail -1)
if [ -z "${BUILT_JAR}" ] && [ -z "${BOOKIE_JAR}" ]; then
echo "Couldn't find bookkeeper jar."
@@ -91,7 +96,7 @@ if [ -z "${BUILT_JAR}" ] && [ -z "${BOOKIE_JAR}" ]; then
;;
esac
- BUILT_JAR=$(ls ${BK_HOME}/target/bookkeeper-server-*.jar 2> /dev/null | grep
-v tests | tail -1)
+ BUILT_JAR=$(ls ${BK_HOME}/target/*bookkeeper-server-*.jar 2> /dev/null |
grep -v tests | tail -1)
if [ -n "${BUILT_JAR}" ]; then
BOOKIE_JAR=$BUILT_JAR
fi
diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml
index 606cca0..bf7f99c 100644
--- a/bookkeeper-server/pom.xml
+++ b/bookkeeper-server/pom.xml
@@ -266,23 +266,6 @@
</executions>
</plugin>
<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>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
diff --git a/site/community/release_guide.md b/site/community/release_guide.md
index a622ec4..23c54ee 100644
--- a/site/community/release_guide.md
+++ b/site/community/release_guide.md
@@ -325,10 +325,12 @@ Copy the source release to the dev repository of
`dist.apache.org`.
3. Copy the BookKeeper source and binary distribution, and their GPG
signatures:
- cp target/bookkeeper-${VERSION}-src.tar.gz
bookkeeper/${RC_DIR}/bookkeeper-${VERSION}-src.tar.gz
- cp target/bookkeeper-${VERSION}-src.tar.gz.asc
bookkeeper/${RC_DIR}/bookkeeper-${VERSION}-src.tar.gz.asc
- cp bookkeeper-server/target/bookkeeper-server-${VERSION}-bin.tar.gz
bookkeeper/${RC_DIR}/bookkeeper-server-${VERSION}-bin.tar.gz
- cp
bookkeeper-server/target/bookkeeper-server-${VERSION}-bin.tar.gz.asc
bookkeeper/${RC_DIR}/bookkeeper-server-${VERSION}-bin.tar.gz.asc
+ cp bookkeeper-dist/target/bookkeeper-${VERSION}-src.tar.gz
bookkeeper/${RC_DIR}/bookkeeper-${VERSION}-src.tar.gz
+ cp bookkeeper-dist/target/bookkeeper-${VERSION}-src.tar.gz.asc
bookkeeper/${RC_DIR}/bookkeeper-${VERSION}-src.tar.gz.asc
+ cp
bookkeeper-dist/server/target/bookkeeper-server-${VERSION}-bin.tar.gz
bookkeeper/${RC_DIR}/bookkeeper-server-${VERSION}-bin.tar.gz
+ cp
bookkeeper-dist/server/target/bookkeeper-server-${VERSION}-bin.tar.gz.asc
bookkeeper/${RC_DIR}/bookkeeper-server-${VERSION}-bin.tar.gz.asc
+ cp bookkeeper-dist/all/target/bookkeeper-all-${VERSION}-bin.tar.gz
bookkeeper/${RC_DIR}/bookkeeper-all-${VERSION}-bin.tar.gz
+ cp bookkeeper-dist/all/target/bookkeeper-all-${VERSION}-bin.tar.gz.asc
bookkeeper/${RC_DIR}/bookkeeper-all-${VERSION}-bin.tar.gz.asc
4. Sign the BookKeeper source and binary distribution.
@@ -337,6 +339,8 @@ Copy the source release to the dev repository of
`dist.apache.org`.
shasum bookkeeper-${VERSION}-src.tar.gz >
bookkeeper-${VERSION}-src.tar.gz.sha1
md5sum bookkeeper-server-${VERSION}-bin.tar.gz >
bookkeeper-server-${VERSION}-bin.tar.gz.md5
shasum bookkeeper-server-${VERSION}-bin.tar.gz >
bookkeeper-server-${VERSION}-bin.tar.gz.sha1
+ md5sum bookkeeper-all-${VERSION}-bin.tar.gz >
bookkeeper-all-${VERSION}-bin.tar.gz.md5
+ shasum bookkeeper-all-${VERSION}-bin.tar.gz >
bookkeeper-all-${VERSION}-bin.tar.gz.sha1
5. Go back to BookKeeper directory, add and commit all the files.
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
