zipkin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adrianc...@apache.org
Subject [incubator-zipkin-brave-karaf] branch master updated: Inlines the source-release component until upstream adjusts excludes (#36)
Date Tue, 19 Feb 2019 06:45:48 GMT
This is an automated email from the ASF dual-hosted git repository.

adriancole pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-zipkin-brave-karaf.git


The following commit(s) were added to refs/heads/master by this push:
     new 40d8a01  Inlines the source-release component until upstream adjusts excludes (#36)
40d8a01 is described below

commit 40d8a0187be60cae7bb2ee0ef90e7d4e98cb66ba
Author: Adrian Cole <adriancole@users.noreply.github.com>
AuthorDate: Tue Feb 19 14:45:44 2019 +0800

    Inlines the source-release component until upstream adjusts excludes (#36)
    
    This makes sure the maven wrapper jar doesn't get into the source dist.
    
    See #31
    See https://issues.apache.org/jira/browse/MASFRES-17
    See https://github.com/apache/maven-resources/pull/1
---
 src/main/assemblies/source-release.xml | 59 ++++++++++++++++++++++++++++++++--
 1 file changed, 56 insertions(+), 3 deletions(-)

diff --git a/src/main/assemblies/source-release.xml b/src/main/assemblies/source-release.xml
index 53e4ff8..498f010 100644
--- a/src/main/assemblies/source-release.xml
+++ b/src/main/assemblies/source-release.xml
@@ -24,7 +24,60 @@
   <formats>
     <format>zip</format>
   </formats>
-  <componentDescriptors>
-    <componentDescriptor>assemblies/source-shared.xml</componentDescriptor>
-  </componentDescriptors>
+
+  <!-- Inlined.. patched from https://github.com/apache/maven-resources/blob/dfd6e72035380fc3bd573d55f0c5b77c903d6431/apache-source-release-assembly-descriptor/pom.xml
-->
+  <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.
+        -->
+
+        <!-- PATCH: Maven wrapper binaries -->
+        <exclude>.mvn/wrapper/maven-wrapper.jar</exclude>
+        <exclude>.mvn/wrapper/MavenWrapperDownloader.class</exclude>
+
+        <!-- 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>
+      </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>


Mime
View raw message