This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git


The following commit(s) were added to refs/heads/master by this push:
     new 28b6322  Override the apache-release profile
     new 427d711  Merge branch 'tp33'
28b6322 is described below

commit 28b63228fe09c12787ee5c96159fe6b97a774284
Author: Stephen Mallette <[email protected]>
AuthorDate: Thu Jan 3 15:10:43 2019 -0500

    Override the apache-release profile
    
    The apache-release profile is fine for the pure java projects but we have 
js, .NET etc and we need to filter out more stuff out of source distribution 
than what the parent pom allows. CTR
---
 pom.xml            |  55 +++++++++++++++++++++++++++++
 source-release.xml | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 156 insertions(+)

diff --git a/pom.xml b/pom.xml
index f8d02ee..ff697c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -214,11 +214,22 @@ limitations under the License.
                         <goals>
                             <goal>jar-no-fork</goal>
                         </goals>
+                        <configuration>
+                            <excludes>
+                                <exclude>gremlin-dotnet/src/obj/**</exclude>
+                                <exclude>gremlin-dotnet/src/_site/**</exclude>
+                                
<exclude>gremlin-javascript/src/main/javascript/gremlin-javascript/node_modules/**</exclude>
+                            </excludes>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
                     <additionalparam>-Xdoclint:none</additionalparam>
@@ -1561,5 +1572,49 @@ limitations under the License.
 
         </profile>
 
+        <!--
+        overriding the default apache release a bit from here:
+             
https://github.com/apache/maven-apache-parent/blob/apache-21/pom.xml
+        because it doesn't filter all the files out that we need as it assumes 
a pure java infrastructure and we
+        have all manner of different languages hanging about
+        -->
+        
+        <profile>
+            <id>apache-release</id>
+            <build>
+                <plugins>
+                    <!-- Create a source-release artifact that contains the 
fully buildable
+                         project directory source structure. This is the 
artifact which is
+                         the official subject of any release vote. -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <executions>
+                            <!-- explicitly ignore the apache parent execution 
or we generate two zips -->
+                            <execution>
+                                <id>source-release-assembly</id>
+                                <phase>none</phase>
+                            </execution>
+                            <!-- this is the tinkerpop version that generates 
the "good" zip -->
+                            <execution>
+                                <id>tinkerpop-source-release-assembly</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    
<runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+                                    <descriptors>
+                                        
<descriptor>source-release.xml</descriptor>
+                                    </descriptors>
+                                    <tarLongFileMode>posix</tarLongFileMode>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
     </profiles>
 </project>
diff --git a/source-release.xml b/source-release.xml
new file mode 100644
index 0000000..012fd7e
--- /dev/null
+++ b/source-release.xml
@@ -0,0 +1,101 @@
+<?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>zip</format>
+    </formats>
+    <!--
+    snipped the following from - 
https://apache.googlesource.com/maven-resources/+/apache-source-release-assembly-descriptor-1.0.6
+    which is the same version 1.0.6 used in the parent pom. not sure how else 
to work around the fact that we want to
+    exclude certain files beyond those in this listing
+    -->
+    <fileSets>
+        <!-- main project directory structure -->
+        <fileSet>
+            <directory>.</directory>
+            <outputDirectory></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>
+
+                <!-- misc -->
+                
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?cobertura\.ser]</exclude>
+
+                <!-- release-plugin temp files -->
+                
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]</exclude>
+                
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]</exclude>
+
+                <!-- custom gremlin variant exclusions that are not "source" 
files but aren't really known to maven -->
+                <exclude>gremlin-dotnet/.glv</exclude>
+                <exclude>gremlin-dotnet/src/docfx/**</exclude>
+                <exclude>gremlin-dotnet/src/target/**</exclude>
+                <exclude>gremlin-dotnet/src/nuget*.exe</exclude>
+                <exclude>gremlin-dotnet/src/obj/**</exclude>
+                <exclude>gremlin-dotnet/src/_site/**</exclude>
+                <exclude>gremlin-dotnet/src/.glv</exclude>
+                <exclude>gremlin-dotnet/src/*.nupkg</exclude>
+                <exclude>gremlin-dotnet/src/*.iml</exclude>
+                <exclude>gremlin-dotnet/**/bin/**</exclude>
+                <exclude>gremlin-dotnet/**/obj/**</exclude>
+                <exclude>gremlin-dotnet/.vscode/**</exclude>
+                <exclude>gremlin-dotnet/test/.glv</exclude>
+                <exclude>gremlin-python/.glv</exclude>
+                <exclude>gremlin-javascript/.glv</exclude>
+                
<exclude>gremlin-javascript/src/main/javascript/gremlin-javascript/doc/**</exclude>
+                
<exclude>gremlin-javascript/src/main/javascript/gremlin-javascript/etc/**</exclude>
+                
<exclude>gremlin-javascript/src/main/javascript/gremlin-javascript/node/**</exclude>
+                
<exclude>gremlin-javascript/src/main/javascript/gremlin-javascript/node_modules/**</exclude>
+
+            </excludes>
+        </fileSet>
+        <!-- license, readme, etc. calculated at build time -->
+        <fileSet>
+            
<directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
+            <outputDirectory></outputDirectory>
+        </fileSet>
+    </fileSets>
+</assembly>
\ No newline at end of file

Reply via email to