This is an automated email from the ASF dual-hosted git repository.
dineshc pushed a commit to branch ozone-0.4.2
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
The following commit(s) were added to refs/heads/ozone-0.4.2 by this push:
new 34eac1a HDDS-2704. Source tar file is not created during the relase
build (#334)
34eac1a is described below
commit 34eac1a157cffc9b7560bce2b84aacdaaf499b12
Author: Elek, Márton <[email protected]>
AuthorDate: Wed Dec 11 22:25:44 2019 +0100
HDDS-2704. Source tar file is not created during the relase build (#334)
---
.../dist/dev-support/bin/dist-tar-stitching | 6 +--
hadoop-ozone/dist/pom.xml | 39 +++++++++++++++
pom.xml | 57 +---------------------
3 files changed, 43 insertions(+), 59 deletions(-)
diff --git a/hadoop-ozone/dist/dev-support/bin/dist-tar-stitching
b/hadoop-ozone/dist/dev-support/bin/dist-tar-stitching
index 408233a..1e4a85e 100755
--- a/hadoop-ozone/dist/dev-support/bin/dist-tar-stitching
+++ b/hadoop-ozone/dist/dev-support/bin/dist-tar-stitching
@@ -38,8 +38,8 @@ function run()
fi
}
-run tar -c -f "hadoop-ozone-${VERSION}.tar" "ozone-${VERSION}"
-run gzip -f "hadoop-ozone-${VERSION}.tar"
+run tar -c -f "hadoop-ozone-${VERSION}-bin.tar" "ozone-${VERSION}"
+run gzip -f "hadoop-ozone-${VERSION}-bin.tar"
echo
-echo "Ozone dist tar available at: ${BASEDIR}/hadoop-ozone-${VERSION}.tar.gz"
+echo "Ozone dist tar available at:
${BASEDIR}/hadoop-ozone-${VERSION}-bin.tar.gz"
echo
diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml
index c1fde9b..2519e15 100644
--- a/hadoop-ozone/dist/pom.xml
+++ b/hadoop-ozone/dist/pom.xml
@@ -388,6 +388,45 @@
</dependencies>
</profile>
+
+ <profile>
+ <id>src</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>src-dist</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <archiveBaseDirectory>../..</archiveBaseDirectory>
+ <appendAssemblyId>false</appendAssemblyId>
+ <attach>false</attach>
+ <finalName>hadoop-ozone-${project.version}-src</finalName>
+ <outputDirectory>target</outputDirectory>
+ <basedir>${project.basedir}/../..</basedir>
+ <!-- Not using descriptorRef and hadoop-assembly dependency
-->
+ <!-- to avoid making hadoop-main to depend on a module
-->
+ <descriptors>
+
<descriptor>${project.basedir}/src/main/assemblies/ozone-src.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
<profile>
<id>docker-build</id>
<build>
diff --git a/pom.xml b/pom.xml
index d88ad99..5a79422 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1903,62 +1903,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
</plugins>
</build>
</profile>
- <profile>
- <id>src</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <inherited>false</inherited>
- <executions>
- <execution>
- <id>src-dist</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <appendAssemblyId>false</appendAssemblyId>
- <attach>false</attach>
- <finalName>hadoop-ozone-${project.version}-src</finalName>
- <outputDirectory>hadoop-ozone/dist/target</outputDirectory>
- <!-- Not using descriptorRef and hadoop-assembly dependency
-->
- <!-- to avoid making hadoop-main to depend on a module
-->
- <descriptors>
-
<descriptor>hadoop-ozone/dist/src/main/assemblies/ozone-src.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <inherited>false</inherited>
- <executions>
- <execution>
- <id>src-dist-msg</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <echo/>
- <echo>Hadoop Ozone source tar available at:
${basedir}/hadoop-ozone/dist/target/hadoop-ozone-${project.version}-src.tar.gz</echo>
- <echo/>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
+
<profile>
<id>sign</id>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
