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: Filters out maven wrapper from the source distribution (#37)
Date Tue, 19 Feb 2019 07:35:36 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 77e320f  Filters out maven wrapper from the source distribution (#37)
77e320f is described below

commit 77e320f0e3956039d1ebeb7ef17f59f03011a9bb
Author: Adrian Cole <adriancole@users.noreply.github.com>
AuthorDate: Tue Feb 19 15:35:28 2019 +0800

    Filters out maven wrapper from the source distribution (#37)
    
    Maven doesn't strictly depend on the Takari wrapper. Excluding this
    decouples us from ongoing discussions as to whether or not it is "nice"
    or required to cite it in the NOTICE file.
    
    See https://lists.apache.org/thread.html/26bbc663ce6f81125110234b30c1ddf63d4ab2a03da408bc9fe07563@%3Cgeneral.incubator.apache.org%3E
    See https://issues.apache.org/jira/browse/MNG-5937
---
 src/main/assemblies/source-release.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/assemblies/source-release.xml b/src/main/assemblies/source-release.xml
index 498f010..5db225c 100644
--- a/src/main/assemblies/source-release.xml
+++ b/src/main/assemblies/source-release.xml
@@ -25,7 +25,7 @@
     <format>zip</format>
   </formats>
 
-  <!-- Inlined.. patched from https://github.com/apache/maven-resources/blob/dfd6e72035380fc3bd573d55f0c5b77c903d6431/apache-source-release-assembly-descriptor/pom.xml
-->
+  <!-- Inlined to exclude all maven wrapper artifacts. This allows us to avoid NOTICE
citations -->
   <fileSets>
     <!-- main project directory structure -->
     <fileSet>
@@ -33,6 +33,11 @@
       <outputDirectory></outputDirectory>
       <useDefaultExcludes>true</useDefaultExcludes>
       <excludes>
+        <!-- PATCH: Maven wrapper -->
+        <exclude>.mvn/**</exclude>
+        <exclude>mvnw</exclude>
+        <exclude>mvnw.cmd</exclude>
+
         <!-- build output -->
         <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]</exclude>
 
@@ -48,10 +53,6 @@
              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>


Mime
View raw message