This is an automated email from the ASF dual-hosted git repository. andor pushed a commit to branch ZK-3028 in repository https://gitbox.apache.org/repos/asf/zookeeper.git
commit c4ac43fb42cec2d5f5afb4a000e7c25df25f1998 Author: Norbert Kalmar <[email protected]> AuthorDate: Fri Jan 18 19:37:46 2019 +0100 ZOOKEEPER-3028 add apache release --- pom.xml | 72 ++++-------------------- src/assembly/jar.xml | 65 --------------------- src/assembly/{tarball.xml => source-package.xml} | 6 +- zookeeper-client/pom.xml | 12 +--- zookeeper-contrib/pom.xml | 12 +--- zookeeper-docs/pom.xml | 13 +---- zookeeper-jute/pom.xml | 12 +--- zookeeper-recipes/pom.xml | 12 +--- zookeeper-server/pom.xml | 12 +--- 9 files changed, 17 insertions(+), 199 deletions(-) diff --git a/pom.xml b/pom.xml index 6ff6206..ce7d3cd 100755 --- a/pom.xml +++ b/pom.xml @@ -449,13 +449,12 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> - <version>1.6</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> <version>2.5.3</version> + <configuration> + <releaseProfiles>apache-release</releaseProfiles> + <arguments>-Dmaven.test.skip.exec ${arguments}</arguments> + </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -581,56 +580,19 @@ <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> - <id>jar</id> + <id>source-package</id> <phase>package</phase> <goals> - <goal>single</goal> + <goal> + single + </goal> </goals> <configuration> <descriptors> - <descriptor>${project.basedir}/src/assembly/jar.xml</descriptor> + <descriptor>${project.basedir}/src/assembly/source-package.xml</descriptor> </descriptors> <finalName>zookeeper-${project.version}</finalName> - <tarLongFileMode>posix</tarLongFileMode> - <archive> - <manifest> - <mainClass>org.apache.zookeeper.server.quorum.QuorumPeerMain</mainClass> - </manifest> - <manifestEntries> - <Built-By>${user.name}</Built-By> - <Built-At>${maven.build.timestamp}</Built-At> - <Built-On>${host.name}</Built-On> - <Implementation-Title>org.apache.zookeeper</Implementation-Title> - <Implementation-Version>${project.version}</Implementation-Version> - <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor> - <!-- The following are OSGi manifest headers --> - <!-- currently hardcoded, when things get more complicated we could use BND - http://www.aqute.biz/Code/Bnd to generate them --> - <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor> - <Bundle-Name>ZooKeeper Bundle</Bundle-Name> - <Bundle-SymbolicName>org.apache.hadoop.zookeeper</Bundle-SymbolicName> - <Bundle-ManifestVersion>2</Bundle-ManifestVersion> - <Bundle-Version>${project.version}</Bundle-Version> - <Bundle-License>http://www.apache.org/licenses/LICENSE-2.0.txt</Bundle-License> - <Bundle-DocURL>http://hadoop.apache.org/zookeeper</Bundle-DocURL> - <Import-Package>javax.management;resolution:=optional,javax.security.auth.callback,javax.security.auth.login,javax.security.sasl,org.slf4j;version="[1.6,2)",org.jboss.netty.buffer;resolution:=optional;version="[3.2,4)",org.jboss.netty.channel;resolution:=optional;version="[3.2,4)",org.jboss.netty.channel.group;resolution:=optional;version="[3.2,4)",org.jboss.netty.channel.socket.nio;resolution:=optional;version="[3.2,4)",org.osgi.framework;resolution:=optional;version=" [...] - <Export-Package>org.apache.zookeeper;version="${project.version}",org.apache.zookeeper.client;version="${project.version}",org.apache.zookeeper.data;version="${project.version}",org.apache.zookeeper.version;version="${project.version}",org.apache.zookeeper.server;version="${project.version}",org.apache.zookeeper.server.auth;version="${project.version}",org.apache.zookeeper.server.persistence;version="${project.version}",org.apache.zookeeper.server.quorum;version="${proj [...] - </manifestEntries> - </archive> - </configuration> - </execution> - <execution> - <id>tarball</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>${project.basedir}/src/assembly/tarball.xml</descriptor> - </descriptors> - <finalName>zookeeper-${project.version}</finalName> - <tarLongFileMode>posix</tarLongFileMode> + <tarLongFileMode>gnu</tarLongFileMode> </configuration> </execution> </executions> @@ -640,20 +602,6 @@ <groupId>com.github.spotbugs</groupId> <artifactId>spotbugs-maven-plugin</artifactId> </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> - <executions> - <execution> - <id>sign-artifacts</id> - <phase>verify</phase> - <goals> - <goal>sign</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> diff --git a/src/assembly/jar.xml b/src/assembly/jar.xml deleted file mode 100644 index e8a14b8..0000000 --- a/src/assembly/jar.xml +++ /dev/null @@ -1,65 +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";> - - <id>jar</id> - <formats> - <format>jar</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - <moduleSets> - <moduleSet> - <useAllReactorProjects>true</useAllReactorProjects> - <includes> - <include>org.apache.zookeeper:zookeeper-jute</include> - </includes> - <sources> - <includeModuleDirectory>false</includeModuleDirectory> - <fileSets> - <fileSet> - <directory>${project.basedir}/src/main/java</directory> - <excludes> - <exclude>**/.generated</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>${project.build.outputDirectory}/org</directory> - <excludes> - <exclude>**/.generated</exclude> - </excludes> - <outputDirectory>org</outputDirectory> - </fileSet> - </fileSets> - </sources> - </moduleSet> - <moduleSet> - <useAllReactorProjects>true</useAllReactorProjects> - <includes> - <include>org.apache.zookeeper:zookeeper-server</include> - </includes> - <sources> - <includeModuleDirectory>false</includeModuleDirectory> - <fileSets> - <fileSet> - <directory>${project.basedir}/src/main/java</directory> - <excludes> - <exclude>**/.generated</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>${project.build.outputDirectory}/org</directory> - <excludes> - <exclude>**/.generated</exclude> - </excludes> - <outputDirectory>org</outputDirectory> - </fileSet> - </fileSets> - </sources> - </moduleSet> - </moduleSets> - <files> - <file> - <source>${project.basedir}/LICENSE.txt</source> - </file> - </files> -</assembly> \ No newline at end of file diff --git a/src/assembly/tarball.xml b/src/assembly/source-package.xml similarity index 96% rename from src/assembly/tarball.xml rename to src/assembly/source-package.xml index 11cd33e..2dbfde4 100644 --- a/src/assembly/tarball.xml +++ b/src/assembly/source-package.xml @@ -2,7 +2,7 @@ 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>tarball</id> + <id>source-package</id> <formats> <format>tar.gz</format> <format>zip</format> @@ -152,9 +152,5 @@ <file> <source>${project.basedir}/README_packaging.txt</source> </file> - <file> - <source>${project.build.directory}/zookeeper-${project.version}-jar.jar</source> - <destName>zookeeper-${project.version}.jar</destName> - </file> </files> </assembly> \ No newline at end of file diff --git a/zookeeper-client/pom.xml b/zookeeper-client/pom.xml index e4e6593..ecf166d 100755 --- a/zookeeper-client/pom.xml +++ b/zookeeper-client/pom.xml @@ -55,17 +55,7 @@ <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> - <id>jar</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <skipAssembly>true</skipAssembly> - </configuration> - </execution> - <execution> - <id>tarball</id> + <id>source-package</id> <phase>package</phase> <goals> <goal>single</goal> diff --git a/zookeeper-contrib/pom.xml b/zookeeper-contrib/pom.xml index fc68658..fb7a926 100755 --- a/zookeeper-contrib/pom.xml +++ b/zookeeper-contrib/pom.xml @@ -48,17 +48,7 @@ <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> - <id>jar</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <skipAssembly>true</skipAssembly> - </configuration> - </execution> - <execution> - <id>tarball</id> + <id>source-package</id> <phase>package</phase> <goals> <goal>single</goal> diff --git a/zookeeper-docs/pom.xml b/zookeeper-docs/pom.xml index e50e8e6..403f322 100644 --- a/zookeeper-docs/pom.xml +++ b/zookeeper-docs/pom.xml @@ -59,7 +59,7 @@ <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> - <id>jar</id> + <id>source-package</id> <phase>package</phase> <goals> <goal>single</goal> @@ -68,17 +68,6 @@ <skipAssembly>true</skipAssembly> </configuration> </execution> - <execution> - <id>tarball</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <skipAssembly>true</skipAssembly> - </configuration> - </execution> - </executions> </plugin> </plugins> diff --git a/zookeeper-jute/pom.xml b/zookeeper-jute/pom.xml index 1533ace..9c5678b 100755 --- a/zookeeper-jute/pom.xml +++ b/zookeeper-jute/pom.xml @@ -150,17 +150,7 @@ <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> - <id>jar</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <skipAssembly>true</skipAssembly> - </configuration> - </execution> - <execution> - <id>tarball</id> + <id>source-package</id> <phase>package</phase> <goals> <goal>single</goal> diff --git a/zookeeper-recipes/pom.xml b/zookeeper-recipes/pom.xml index 167f815..104abdd 100755 --- a/zookeeper-recipes/pom.xml +++ b/zookeeper-recipes/pom.xml @@ -69,17 +69,7 @@ <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> - <id>jar</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <skipAssembly>true</skipAssembly> - </configuration> - </execution> - <execution> - <id>tarball</id> + <id>source-package</id> <phase>package</phase> <goals> <goal>single</goal> diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml index 257b7ce..153fc22 100755 --- a/zookeeper-server/pom.xml +++ b/zookeeper-server/pom.xml @@ -270,17 +270,7 @@ <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> - <id>jar</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <skipAssembly>true</skipAssembly> - </configuration> - </execution> - <execution> - <id>tarball</id> + <id>source-package</id> <phase>package</phase> <goals> <goal>single</goal>
