Repository: incubator-tephra Updated Branches: refs/heads/release-changes [created] 210616755
Assemble Apache release Project: http://git-wip-us.apache.org/repos/asf/incubator-tephra/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tephra/commit/21061675 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tephra/tree/21061675 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tephra/diff/21061675 Branch: refs/heads/release-changes Commit: 21061675504f4b1a2a3448c93612f99d15fbced3 Parents: ab52491 Author: poorna <[email protected]> Authored: Wed May 11 19:13:54 2016 -0700 Committer: poorna <[email protected]> Committed: Wed May 11 19:13:54 2016 -0700 ---------------------------------------------------------------------- pom.xml | 7 +---- src/assemble/bin.xml | 3 ++ src/assemble/src.xml | 59 ++++++++++++++++++++++++++++++++++++++++ tephra-distribution/pom.xml | 49 +++++++++++++++++++++++++++++++-- 4 files changed, 109 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/21061675/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f85b59c..60911fe 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> - <version>13</version> + <version>17</version> </parent> <groupId>org.apache.tephra</groupId> @@ -463,11 +463,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <version>2.4</version> - <configuration> - <descriptors> - <descriptor>src/assemble/bin.xml</descriptor> - </descriptors> - </configuration> </plugin> <!-- Deploy plugin --> http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/21061675/src/assemble/bin.xml ---------------------------------------------------------------------- diff --git a/src/assemble/bin.xml b/src/assemble/bin.xml index 778df13..5513d1a 100644 --- a/src/assemble/bin.xml +++ b/src/assemble/bin.xml @@ -55,7 +55,10 @@ <outputDirectory>.</outputDirectory> <includes> <include>LICENSE</include> + <include>NOTICE</include> <include>README.rst</include> + <include>KEYS</include> + <include>DISCLAIMER</include> </includes> <fileMode>0644</fileMode> </fileSet> http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/21061675/src/assemble/src.xml ---------------------------------------------------------------------- diff --git a/src/assemble/src.xml b/src/assemble/src.xml new file mode 100644 index 0000000..4472c28 --- /dev/null +++ b/src/assemble/src.xml @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ 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. + --> + +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd";> + <id>source-release</id> + <formats> + <format>tar.gz</format> + </formats> + <includeBaseDirectory>true</includeBaseDirectory> + <moduleSets> + <moduleSet> + + <!-- Enable access to all projects in the current multimodule build! --> + <useAllReactorProjects>true</useAllReactorProjects> + <sources/> + </moduleSet> + </moduleSets> + <fileSets> + <!-- Include top level bin directory --> + <!-- First copy all but the *.cmd files--> + <fileSet> + <directory>${project.basedir}/../bin</directory> + <outputDirectory>bin</outputDirectory> + <fileMode>0755</fileMode> + <directoryMode>0755</directoryMode> + </fileSet> + <!-- Include top level text files--> + <fileSet> + <directory>${project.basedir}/..</directory> + <outputDirectory>.</outputDirectory> + <includes> + <include>LICENSE</include> + <include>NOTICE</include> + <include>README.rst</include> + <include>KEYS</include> + <include>DISCLAIMER</include> + </includes> + <fileMode>0644</fileMode> + </fileSet> + </fileSets> +</assembly> http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/21061675/tephra-distribution/pom.xml ---------------------------------------------------------------------- diff --git a/tephra-distribution/pom.xml b/tephra-distribution/pom.xml index 872c51c..98d18a3 100644 --- a/tephra-distribution/pom.xml +++ b/tephra-distribution/pom.xml @@ -78,6 +78,7 @@ <build> <plugins> + <!-- Generate binary distribution artifact --> <plugin> <artifactId>maven-assembly-plugin</artifactId> <executions> @@ -88,7 +89,8 @@ <goal>single</goal> </goals> <configuration> - <finalName>tephra-${project.version}</finalName> + <finalName>apache-tephra-${project.version}</finalName> + <appendAssemblyId>true</appendAssemblyId> <formats> <format>tar.gz</format> </formats> @@ -103,6 +105,47 @@ </build> <profiles> + <!-- Profile to generate apache release artifact --> + <profile> + <id>apache-release</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <finalName>apache-tephra-${project.version}</finalName> + <appendAssemblyId>true</appendAssemblyId> + <formats> + <format>tar.gz</format> + </formats> + <descriptors> + <descriptor>src/assemble/src.xml</descriptor> + </descriptors> + <tarLongFileMode>gnu</tarLongFileMode> + </configuration> + <executions> + <execution> + <id>src-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-remote-resources-plugin</artifactId> + <configuration> + <!-- Disable this plugin so that it won't generate a DEPENDENCIES file in the source tar --> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <!-- Profile to generate aggregated coverage report. Piggy-back on the distribution module as it already has dependency on all other modules. @@ -160,8 +203,8 @@ <include name="**/jacoco.exec" /> </fileset> </executiondata> - <structure name="Tephra Coverage Project"> - <group name="Tephra"> + <structure name="Apache Tephra Coverage Project"> + <group name="Apache Tephra"> <classfiles> <fileset dir="../"> <include name="**/*.class" />
