Skip to content

Commit

Permalink
ZOOKEEPER-3285: Maven migration - add convenience tar, assembly modul…
Browse files Browse the repository at this point in the history
…e and sha512 generation

Author: Norbert Kalmar <nkalmar@yahoo.com>

Reviewers: andor@apache.org

Closes apache#828 from nkalmar/master and squashes the following commits:

817077f [Norbert Kalmar] ZOOKEEPER-3285 - add some info on 3rd party plugin
af1fcd5 [Norbert Kalmar] ZOOKEEPER-3285 - remove zip generation and fix versions
c19d186 [Norbert Kalmar] ZOOKEEPER-3285 - add Apache license headers
4e7b659 [Norbert Kalmar] ZOOKEEPER-3285 - add auto sha512 checksum generation for all maven generated artifact
915d530 [Norbert Kalmar] ZOOKEEPER-3285 - create convenience tar and assembly sub-module
  • Loading branch information
nkalmar authored and RokLenarcic committed Sep 3, 2022
1 parent 6a11513 commit 09ef53a
Show file tree
Hide file tree
Showing 13 changed files with 420 additions and 215 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
30 changes: 16 additions & 14 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 @@ -521,6 +522,11 @@
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>net.nicoulaj.maven.plugins</groupId>
<artifactId>checksum-maven-plugin</artifactId>
<version>1.8</version>
</plugin>
<plugin>
<groupId>org.openclover</groupId>
<artifactId>clover-maven-plugin</artifactId>
Expand Down Expand Up @@ -660,26 +666,22 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<!-- Maven's deploy plugin only creates checksums during the deployment of the jar artifacts to repo. -->
<!-- We also want to sign tarballs. Nicoulaj's plugin is the recommended solution by the community. -->
<groupId>net.nicoulaj.maven.plugins</groupId>
<artifactId>checksum-maven-plugin</artifactId>
<executions>
<execution>
<id>source-package</id>
<phase>package</phase>
<goals>
<goal>
single
</goal>
<goal>artifacts</goal>
</goals>
<configuration>
<descriptors>
<descriptor>${project.basedir}/source-package.xml</descriptor>
</descriptors>
<finalName>zookeeper-${project.version}</finalName>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</execution>
</executions>
<configuration>
<algorithms>
<algorithm>SHA-512</algorithm>
</algorithms>
</configuration>
</plugin>

<plugin>
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>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-jute</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-client</artifactId>
<version>${project.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-recipes</artifactId>
<version>${project.version}</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>posix</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>

0 comments on commit 09ef53a

Please sign in to comment.