Skip to content

Commit

Permalink
ZOOKEEPER-3285 - create convenience tar and assembly sub-module
Browse files Browse the repository at this point in the history
  • Loading branch information
nkalmar committed Feb 21, 2019
1 parent 5375c25 commit 915d530
Show file tree
Hide file tree
Showing 13 changed files with 371 additions and 223 deletions.
2 changes: 2 additions & 0 deletions build.xml
Expand Up @@ -878,6 +878,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">

<copy todir="${dist.dir}" includeEmptyDirs="true">
<fileset dir="${basedir}" excludes="**/*.template **/docs/build/**/* **/ivy*.jar">
<include name="zookeeper-assembly/**"/>
<include name="zookeeper-recipes/**"/>
<include name="zookeeper-docs/**"/>
<include name="zookeeper-contrib/**"/>
Expand Down Expand Up @@ -1005,6 +1006,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">

<copy todir="${dist.dir}" includeEmptyDirs="true">
<fileset dir="${basedir}" excludes="**/*.template **/docs/build/**/* **/ivy*.jar">
<include name="zookeeper-assembly/**"/>
<include name="zookeeper-recipes/**"/>
<include name="zookeeper-docs/**"/>
<include name="zookeeper-contrib/**"/>
Expand Down
23 changes: 1 addition & 22 deletions pom.xml
Expand Up @@ -62,6 +62,7 @@
<module>zookeeper-server</module>
<module>zookeeper-client</module>
<module>zookeeper-recipes</module>
<module>zookeeper-assembly</module>
</modules>

<scm>
Expand Down Expand Up @@ -659,28 +660,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>source-package</id>
<phase>package</phase>
<goals>
<goal>
single
</goal>
</goals>
<configuration>
<descriptors>
<descriptor>${project.basedir}/source-package.xml</descriptor>
</descriptors>
<finalName>zookeeper-${project.version}</finalName>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>com.github.spotbugs</groupId>
Expand Down
91 changes: 0 additions & 91 deletions source-package.xml

This file was deleted.

105 changes: 105 additions & 0 deletions zookeeper-assembly/pom.xml
@@ -0,0 +1,105 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<!--
/**
* 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.
*/
-->
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>3.6.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-assembly</artifactId>
<packaging>pom</packaging>
<name>Apache ZooKeeper - Assembly</name>
<description>ZooKeeper Assembly</description>

<properties>
<rw.file.permission>0644</rw.file.permission>
<rwx.file.permission>0755</rwx.file.permission>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-docs</artifactId>
<version>3.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-jute</artifactId>
<version>3.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-server</artifactId>
<version>3.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-client</artifactId>
<version>3.6.0-SNAPSHOT</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-recipes</artifactId>
<version>3.6.0-SNAPSHOT</version>
<type>pom</type>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>${project.basedir}/src/main/assembly/source-package.xml</descriptor>
<descriptor>${project.basedir}/src/main/assembly/bin-package.xml</descriptor>
</descriptors>
<finalName>zookeeper-${project.version}</finalName>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>

</project>
111 changes: 111 additions & 0 deletions zookeeper-assembly/src/main/assembly/bin-package.xml
@@ -0,0 +1,111 @@
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">

<id>bin-package</id>
<formats>
<format>tar.gz</format>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<componentDescriptors>
<componentDescriptor>src/main/assembly/components.xml</componentDescriptor>
</componentDescriptors>

<moduleSets>
<!-- ZooKeeper jars (excluding pom projects) including 3rd party dependencies -->
<moduleSet>
<useAllReactorProjects>true</useAllReactorProjects>
<includes>
<include>org.apache.zookeeper:zookeeper-server</include>
<include>org.apache.zookeeper:zookeeper-recipes-election</include>
<include>org.apache.zookeeper:zookeeper-recipes-lock</include>
<include>org.apache.zookeeper:zookeeper-recipes-queue</include>
</includes>

<binaries>
<outputDirectory>lib</outputDirectory>
<unpack>false</unpack>
<dependencySets>
<dependencySet>
<excludes>
<exclude>org.apache.zookeeper:zookeeper-recipes</exclude>
<exclude>org.apache.zookeeper:zookeeper-client</exclude>
<exclude>org.apache.zookeeper:zookeeper-docs</exclude>
</excludes>
</dependencySet>
</dependencySets>
</binaries>
</moduleSet>
</moduleSets>

<fileSets>
<fileSet>
<!-- ZooKeeper generated documents -->
<directory>${project.basedir}/../zookeeper-docs/target/html</directory>
<outputDirectory>docs</outputDirectory>
<fileMode>${rw.file.permission}</fileMode>
<directoryMode>${rwx.file.permission}</directoryMode>
</fileSet>
<fileSet>
<!-- License files for 3rd party libs -->
<directory>${project.basedir}/../zookeeper-server/src/main/resources/lib</directory>
<includes>
<include>*.txt</include>
</includes>
<outputDirectory>lib</outputDirectory>
<fileMode>${rw.file.permission}</fileMode>
</fileSet>

<!-- Add source jars "manually", as the :source classiffier doesn't work in moduleSets -->
<fileSet>
<directory>${project.basedir}/../zookeeper-server/target</directory>
<outputDirectory>lib</outputDirectory>
<includes>
<include>zookeeper-*-sources.jar</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.basedir}/../zookeeper-jute/target</directory>
<outputDirectory>lib</outputDirectory>
<includes>
<include>zookeeper-*-sources.jar</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.basedir}/../zookeeper-recipes/zookeeper-recipes-election/target</directory>
<outputDirectory>lib</outputDirectory>
<includes>
<include>zookeeper-*-sources.jar</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.basedir}/../zookeeper-recipes/zookeeper-recipes-lock/target</directory>
<outputDirectory>lib</outputDirectory>
<includes>
<include>zookeeper-*-sources.jar</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.basedir}/../zookeeper-recipes/zookeeper-recipes-queue/target</directory>
<outputDirectory>lib</outputDirectory>
<includes>
<include>zookeeper-*-sources.jar</include>
</includes>
</fileSet>
</fileSets>

<files>
<file>
<source>${project.basedir}/../zookeeper-server/src/main/resources/lib/cobertura/README.txt</source>
<outputDirectory>lib/cobertura</outputDirectory>
<fileMode>${rw.file.permission}</fileMode>
</file>
<file>
<source>${project.basedir}/../zookeeper-server/src/main/resources/lib/jdiff/zookeeper_3.1.1.xml</source>
<outputDirectory>lib/jdiff</outputDirectory>
<fileMode>${rw.file.permission}</fileMode>
</file>
</files>

</assembly>

0 comments on commit 915d530

Please sign in to comment.