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: Works around inheritance that results in an empty DEPENDENCIES file (#39)
Date Tue, 19 Feb 2019 15:04:50 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 4c57150  Works around inheritance that results in an empty DEPENDENCIES file (#39)
4c57150 is described below

commit 4c57150a909cf128c497738a1cd57e333d1376a3
Author: Adrian Cole <adriancole@users.noreply.github.com>
AuthorDate: Tue Feb 19 23:01:35 2019 +0800

    Works around inheritance that results in an empty DEPENDENCIES file (#39)
    
    org.apache:apache:21 sets maven-remote-resources-plugin in plugins, not pluginManagement
    This results in execution in the parent project, and a side effect of an empty
    DEPENDENCIES file in the assembly when packaged with the apache-release profile.
    
    https://issues.apache.org/jira/browse/MPOM-218
    
    This works around the problem by skipping at the parent level at the cost of having to
    un-skip it at every deployed child.
---
 exporter-sender-kafka/pom.xml  |  6 ++++++
 exporter-sender-okhttp/pom.xml |  6 ++++++
 exporter/pom.xml               |  6 ++++++
 features/pom.xml               |  6 ++++++
 pom.xml                        | 16 ++++++++++++++++
 5 files changed, 40 insertions(+)

diff --git a/exporter-sender-kafka/pom.xml b/exporter-sender-kafka/pom.xml
index 918a04c..2843bb1 100644
--- a/exporter-sender-kafka/pom.xml
+++ b/exporter-sender-kafka/pom.xml
@@ -62,6 +62,12 @@
   <build>
     <plugins>
       <plugin>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+        <configuration>
+          <skip>false</skip>
+        </configuration>
+      </plugin>
+      <plugin>
         <groupId>biz.aQute.bnd</groupId>
         <artifactId>bnd-maven-plugin</artifactId>
       </plugin>
diff --git a/exporter-sender-okhttp/pom.xml b/exporter-sender-okhttp/pom.xml
index ccf9201..318ec85 100644
--- a/exporter-sender-okhttp/pom.xml
+++ b/exporter-sender-okhttp/pom.xml
@@ -57,6 +57,12 @@
   <build>
     <plugins>
       <plugin>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+        <configuration>
+          <skip>false</skip>
+        </configuration>
+      </plugin>
+      <plugin>
         <groupId>biz.aQute.bnd</groupId>
         <artifactId>bnd-maven-plugin</artifactId>
       </plugin>
diff --git a/exporter/pom.xml b/exporter/pom.xml
index 4af39e8..0cf4fa6 100644
--- a/exporter/pom.xml
+++ b/exporter/pom.xml
@@ -61,6 +61,12 @@
   <build>
     <plugins>
       <plugin>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+        <configuration>
+          <skip>false</skip>
+        </configuration>
+      </plugin>
+      <plugin>
         <groupId>biz.aQute.bnd</groupId>
         <artifactId>bnd-maven-plugin</artifactId>
       </plugin>
diff --git a/features/pom.xml b/features/pom.xml
index 458eae7..cd6e8db 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -41,6 +41,12 @@
     </resources>
     <plugins>
       <plugin>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+        <configuration>
+          <skip>false</skip>
+        </configuration>
+      </plugin>
+      <plugin>
         <artifactId>maven-resources-plugin</artifactId>
         <executions>
           <execution>
diff --git a/pom.xml b/pom.xml
index dd6d66b..1a447fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -433,6 +433,22 @@
           </execution>
         </executions>
       </plugin>
+
+      <!-- org.apache:apache:21 sets maven-remote-resources-plugin in plugins, not pluginManagement
+           This results in execution in the parent project, and a side effect of an empty
+           DEPENDENCIES file in the assembly when packaged with the apache-release profile.
+
+           https://issues.apache.org/jira/browse/MPOM-218
+
+           This works around the problem by skipping at the parent level at the cost of having
to
+           un-skip it at every deployed child.
+       -->
+      <plugin>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 


Mime
View raw message