hadoop-ozone-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bha...@apache.org
Subject [hadoop-ozone] 01/01: Revert "HDDS-2704. Source tar file is not created during the relase build (#334)"
Date Mon, 16 Dec 2019 22:35:09 GMT
This is an automated email from the ASF dual-hosted git repository.

bharat pushed a commit to branch revert-334-HDDS-2704
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git

commit 31b524736bee34d87dc948dcebdb50ca2062be8a
Author: Bharat Viswanadham <bviswanadham@cloudera.com>
AuthorDate: Mon Dec 16 14:34:40 2019 -0800

    Revert "HDDS-2704. Source tar file is not created during the relase build (#334)"
    
    This reverts commit 15f4ed47dffb8da62074790d55699ed98985513d.
---
 .../dist/dev-support/bin/dist-tar-stitching        |  6 +--
 hadoop-ozone/dist/pom.xml                          | 39 ---------------
 pom.xml                                            | 57 +++++++++++++++++++++-
 3 files changed, 59 insertions(+), 43 deletions(-)

diff --git a/hadoop-ozone/dist/dev-support/bin/dist-tar-stitching b/hadoop-ozone/dist/dev-support/bin/dist-tar-stitching
index 1e4a85e..408233a 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}-bin.tar" "ozone-${VERSION}"
-run gzip -f "hadoop-ozone-${VERSION}-bin.tar"
+run tar -c -f "hadoop-ozone-${VERSION}.tar" "ozone-${VERSION}"
+run gzip -f "hadoop-ozone-${VERSION}.tar"
 echo
-echo "Ozone dist tar available at: ${BASEDIR}/hadoop-ozone-${VERSION}-bin.tar.gz"
+echo "Ozone dist tar available at: ${BASEDIR}/hadoop-ozone-${VERSION}.tar.gz"
 echo
diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml
index 2519e15..c1fde9b 100644
--- a/hadoop-ozone/dist/pom.xml
+++ b/hadoop-ozone/dist/pom.xml
@@ -388,45 +388,6 @@
       </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 875c16c..55d9102 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1910,7 +1910,62 @@ 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: ozone-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org


Mime
View raw message