You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by an...@apache.org on 2020/01/17 16:09:17 UTC
[zookeeper] branch branch-3.6 updated: ZOOKEEPER-3695: Source
release tarball does not match repository in 3.6.0
This is an automated email from the ASF dual-hosted git repository.
andor pushed a commit to branch branch-3.6
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/branch-3.6 by this push:
new fea678d ZOOKEEPER-3695: Source release tarball does not match repository in 3.6.0
fea678d is described below
commit fea678d7837ac0673a39dc10499fc8a526f351db
Author: Enrico Olivelli <en...@diennea.com>
AuthorDate: Fri Jan 17 17:08:56 2020 +0100
ZOOKEEPER-3695: Source release tarball does not match repository in 3.6.0
- use the same configuration as in Apache Parent Pom to generate the source tarball
- drop the custom made configuration for the source tarball
Author: Enrico Olivelli <en...@diennea.com>
Reviewers: andor@apache.org
Closes #1226 from eolivelli/fix/ZOOKEEPER-3695-source-tarball and squashes the following commits:
781d95e5c [Enrico Olivelli] Fix typo
21eac30dd [Enrico Olivelli] Fix formatting and add comment
7eca978f6 [Enrico Olivelli] ZOOKEEPER-3695 Source release tarball does not match repository in 3.6.0 - use the same configuration as in Apache Parent Pom to generate the source tarball - drop the custom made configuration for the source tarball
(cherry picked from commit 9053f7c431bb17ed79c2be129b6ba4ba18d15ab1)
Signed-off-by: Andor Molnar <an...@apache.org>
---
pom.xml | 40 ++++++-
zookeeper-assembly/pom.xml | 17 +--
.../src/main/assembly/source-package.xml | 118 ---------------------
3 files changed, 40 insertions(+), 135 deletions(-)
diff --git a/pom.xml b/pom.xml
index c523e9d..d68b7c0 100755
--- a/pom.xml
+++ b/pom.xml
@@ -267,6 +267,45 @@
<activeByDefault>true</activeByDefault>
</activation>
</profile>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.apache.resources</groupId>
+ <artifactId>apache-source-release-assembly-descriptor</artifactId>
+ <version>1.0.6</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>source-release-assembly-tar-gz</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+ <descriptorRefs>
+ <!-- defined in Apache Parent Pom -->
+ <descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef>
+ </descriptorRefs>
+ <finalName>apache-zookeeper-${project.version}</finalName>
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+ <tarLongFileMode>posix</tarLongFileMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<properties>
@@ -681,7 +720,6 @@
</execution>
</executions>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
diff --git a/zookeeper-assembly/pom.xml b/zookeeper-assembly/pom.xml
index 3696495..15210a3 100755
--- a/zookeeper-assembly/pom.xml
+++ b/zookeeper-assembly/pom.xml
@@ -125,21 +125,6 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <id>source-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>${project.basedir}/src/main/assembly/source-package.xml</descriptor>
- </descriptors>
- <finalName>apache-zookeeper-${project.version}</finalName>
- <appendAssemblyId>false</appendAssemblyId>
- <tarLongFileMode>posix</tarLongFileMode>
- </configuration>
- </execution>
- <execution>
<id>bin-assembly</id>
<phase>package</phase>
<goals>
@@ -191,4 +176,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/zookeeper-assembly/src/main/assembly/source-package.xml b/zookeeper-assembly/src/main/assembly/source-package.xml
deleted file mode 100644
index 15a5c68..0000000
--- a/zookeeper-assembly/src/main/assembly/source-package.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<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">
-<!--
-/**
- * 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.
- */
--->
- <id>source-package</id>
- <formats>
- <format>tar.gz</format>
- </formats>
- <includeBaseDirectory>true</includeBaseDirectory>
- <componentDescriptors>
- <componentDescriptor>src/main/assembly/components.xml</componentDescriptor>
- </componentDescriptors>
-
- <fileSets>
- <fileSet>
- <directory>${project.basedir}/../zookeeper-assembly</directory>
- <excludes>
- <exclude>**/target/**</exclude>
- </excludes>
- <outputDirectory>zookeeper-assembly</outputDirectory>
- <fileMode>${rw.file.permission}</fileMode>
- <directoryMode>${rwx.file.permission}</directoryMode>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../zookeeper-client</directory>
- <excludes>
- <exclude>**/target/**</exclude>
- </excludes>
- <outputDirectory>zookeeper-client</outputDirectory>
- <fileMode>${rw.file.permission}</fileMode>
- <directoryMode>${rwx.file.permission}</directoryMode>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../zookeeper-contrib</directory>
- <excludes>
- <exclude>**/target/**</exclude>
- </excludes>
- <outputDirectory>zookeeper-contrib</outputDirectory>
- <fileMode>${rw.file.permission}</fileMode>
- <directoryMode>${rwx.file.permission}</directoryMode>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../zookeeper-docs</directory>
- <excludes>
- <exclude>**/target/**</exclude>
- </excludes>
- <outputDirectory>zookeeper-docs</outputDirectory>
- <fileMode>${rw.file.permission}</fileMode>
- <directoryMode>${rwx.file.permission}</directoryMode>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../zookeeper-it</directory>
- <excludes>
- <exclude>**/target/**</exclude>
- </excludes>
- <outputDirectory>zookeeper-it</outputDirectory>
- <fileMode>${rw.file.permission}</fileMode>
- <directoryMode>${rwx.file.permission}</directoryMode>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../zookeeper-jute</directory>
- <excludes>
- <exclude>**/target/**</exclude>
- </excludes>
- <outputDirectory>zookeeper-jute</outputDirectory>
- <fileMode>${rw.file.permission}</fileMode>
- <directoryMode>${rwx.file.permission}</directoryMode>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../zookeeper-recipes</directory>
- <excludes>
- <exclude>**/target/**</exclude>
- </excludes>
- <outputDirectory>zookeeper-recipes</outputDirectory>
- <fileMode>${rw.file.permission}</fileMode>
- <directoryMode>${rwx.file.permission}</directoryMode>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../zookeeper-server</directory>
- <excludes>
- <exclude>**/target/**</exclude>
- </excludes>
- <outputDirectory>zookeeper-server</outputDirectory>
- <fileMode>${rw.file.permission}</fileMode>
- <directoryMode>${rwx.file.permission}</directoryMode>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/..</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>pom.xml</include>
- <include>excludeFindBugsFilter.xml</include>
- <include>owaspSuppressions.xml</include>
- <include>checktyle.xml</include>
- <include>checktyleSuppressions.xml</include>
- </includes>
- <fileMode>${rw.file.permission}</fileMode>
- </fileSet>
- </fileSets>
-</assembly>