You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@crail.apache.org by pe...@apache.org on 2018/10/26 10:36:37 UTC

[1/2] incubator-crail git commit: [Build] Generate correct source tarball

Repository: incubator-crail
Updated Branches:
  refs/heads/master 9fb3cdef6 -> fe2c89611


[Build] Generate correct source tarball

Disable generation of source tarball inherited from Apache parent pom
since the name of the artifact does not adhere to
apche-crail-X.Y-incubating-src. Instead generate source tarball in
the assembly module. Add excludes to avoid committing build files.

https://jira.apache.org/jira/projects/CRAIL/issues/CRAIL-56

Signed-off-by: Jonas Pfefferle <pe...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-crail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-crail/commit/5e7d93d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-crail/tree/5e7d93d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-crail/diff/5e7d93d6

Branch: refs/heads/master
Commit: 5e7d93d6b2e9478f17f323756170b54e69287b13
Parents: 9fb3cde
Author: Jonas Pfefferle <pe...@apache.org>
Authored: Thu Oct 25 15:43:14 2018 +0200
Committer: Jonas Pfefferle <pe...@apache.org>
Committed: Thu Oct 25 16:04:11 2018 +0200

----------------------------------------------------------------------
 assembly/pom.xml                               | 20 ++++-
 assembly/src/main/assembly/source-assembly.xml | 92 +++++++++++++++++++++
 pom.xml                                        | 11 +--
 3 files changed, 109 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/5e7d93d6/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 4844021..0a8e7a8 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -118,7 +118,7 @@
         <artifactId>maven-assembly-plugin</artifactId>
         <executions>
           <execution>
-            <id>dist</id>
+            <id>binary-release-assembly-crail</id>
             <phase>package</phase>
             <goals>
               <goal>single</goal>
@@ -130,11 +130,23 @@
               </descriptors>
             </configuration>
           </execution>
+          <execution>
+            <id>source-release-assembly-crail</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <appendAssemblyId>false</appendAssemblyId>
+              <descriptors>
+                <descriptor>src/main/assembly/source-assembly.xml</descriptor>
+              </descriptors>
+              <finalName>apache-crail-${project.version}-src</finalName>
+              <tarLongFileMode>gnu</tarLongFileMode>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
-
-
-
     </plugins>
   </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/5e7d93d6/assembly/src/main/assembly/source-assembly.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/assembly/source-assembly.xml b/assembly/src/main/assembly/source-assembly.xml
new file mode 100644
index 0000000..0aa0297
--- /dev/null
+++ b/assembly/src/main/assembly/source-assembly.xml
@@ -0,0 +1,92 @@
+<?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>
+  <id>source-release</id>
+  <formats>
+    <format>tar.gz</format>
+  </formats>
+  <fileSets>
+    <!-- main project directory structure -->
+    <fileSet>
+      <directory>..</directory>
+      <outputDirectory/>
+      <useDefaultExcludes>true</useDefaultExcludes>
+      <excludes>
+        <!-- build output -->
+        <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]
+        </exclude>
+
+        <!-- NOTE: Most of the following excludes should not be required
+          if the standard release process is followed. This is because the release
+          plugin checks out project sources into a location like target/checkout, then
+          runs the build from there. The result is a source-release archive that comes
+          from a pretty clean directory structure. HOWEVER, if the release plugin is
+          configured to run extra goals or generate a project website, it's definitely
+          possible that some of these files will be present. So, it's safer to exclude
+          them. -->
+
+        <!-- IDEs -->
+        <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?maven-eclipse\.xml]
+        </exclude>
+        <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.project]
+        </exclude>
+        <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.classpath]
+        </exclude>
+        <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iws]
+        </exclude>
+        <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.idea(/.*)?]
+        </exclude>
+        <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?out(/.*)?]
+        </exclude>
+        <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.ipr]
+        </exclude>
+        <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iml]
+        </exclude>
+        <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.settings(/.*)?]
+        </exclude>
+        <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?]
+        </exclude>
+        <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?]
+        </exclude>
+        <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?]
+        </exclude>
+
+
+        <!-- scm -->
+        <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.gitignore(/.*)?]
+        </exclude>
+
+        <!-- release-plugin temp files -->
+        <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]
+        </exclude>
+        <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]
+        </exclude>
+
+        <exclude>**/*.swp</exclude>
+        <exclude>doc/build/**</exclude>
+      </excludes>
+    </fileSet>
+    <!-- LICENSE, NOTICE, DEPENDENCIES -->
+    <fileSet>
+      <directory>${project.build.directory}/maven-shared-archive-resources/META-INF
+      </directory>
+      <outputDirectory/>
+    </fileSet>
+  </fileSets>
+</assembly>

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/5e7d93d6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0d6e199..c62bc09 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,6 @@
   <properties>
     <build.copyDependenciesPhase>package</build.copyDependenciesPhase>
     <hadoop.version>2.7.3</hadoop.version>
-    <sourceReleaseAssemblyDescriptor>source-release-tar</sourceReleaseAssemblyDescriptor>
   </properties>
 
   <profiles>
@@ -154,15 +153,7 @@
         <executions>
           <execution>
             <id>source-release-assembly</id>
-            <phase>package</phase>
-            <configuration combine.self="override">
-              <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
-              <finalName>apache-crail-${project.version}</finalName>
-              <tarLongFileMode>posix</tarLongFileMode>
-              <descriptorRefs>
-                <descriptorRef>src</descriptorRef>
-              </descriptorRefs>
-            </configuration>
+            <phase>none</phase>
           </execution>
         </executions>
       </plugin>


[2/2] incubator-crail git commit: [Build] Generate checksum files

Posted by pe...@apache.org.
[Build] Generate checksum files

Generate checksum SHA-512 files for release tarballs.

https://jira.apache.org/jira/projects/CRAIL/issues/CRAIL-56

Signed-off-by: Jonas Pfefferle <pe...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-crail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-crail/commit/fe2c8961
Tree: http://git-wip-us.apache.org/repos/asf/incubator-crail/tree/fe2c8961
Diff: http://git-wip-us.apache.org/repos/asf/incubator-crail/diff/fe2c8961

Branch: refs/heads/master
Commit: fe2c896112ce86e8f3de0bc32159d7f02ce7cb7d
Parents: 5e7d93d
Author: Jonas Pfefferle <pe...@apache.org>
Authored: Thu Oct 25 15:50:02 2018 +0200
Committer: Jonas Pfefferle <pe...@apache.org>
Committed: Thu Oct 25 16:05:42 2018 +0200

----------------------------------------------------------------------
 assembly/pom.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/fe2c8961/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 0a8e7a8..c9eb9bf 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -147,6 +147,23 @@
           </execution>
         </executions>
       </plugin>
+     <plugin>
+        <groupId>net.ju-n.maven.plugins</groupId>
+        <artifactId>checksum-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>artifacts</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <algorithms>
+            <algorithm>SHA-512</algorithm>
+          </algorithms>
+          <failOnError>false</failOnError>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>