Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Maven migration - ZOOKEEPER-3285 add convenience tar, assembly module and sha512 generation #828

Closed
wants to merge 5 commits into from
Closed

Maven migration - ZOOKEEPER-3285 add convenience tar, assembly module and sha512 generation #828

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
915d530
ZOOKEEPER-3285 - create convenience tar and assembly sub-module
nkalmar Feb 21, 2019
4e7b659
ZOOKEEPER-3285 - add auto sha512 checksum generation for all maven ge…
nkalmar Feb 21, 2019
c19d186
ZOOKEEPER-3285 - add Apache license headers
nkalmar Feb 21, 2019
af1fcd5
ZOOKEEPER-3285 - remove zip generation and fix versions
nkalmar Feb 23, 2019
817077f
ZOOKEEPER-3285 - add some info on 3rd party plugin
nkalmar Feb 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions build.xml
View file
Open in desktop
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
28 changes: 14 additions & 14 deletions pom.xml
View file
Open in desktop
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,20 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<groupId>net.nicoulaj.maven.plugins</groupId>
nkalmar marked this conversation as resolved.
Show resolved Hide resolved
<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
View file
Open in desktop

This file was deleted.

105 changes: 105 additions & 0 deletions zookeeper-assembly/pom.xml
View file
Open in desktop
@@ -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>
nkalmar marked this conversation as resolved.
Show resolved Hide resolved
</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>
nkalmar marked this conversation as resolved.
Show resolved Hide resolved
</configuration>
</execution>
</executions>
</plugin>

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

</project>