You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by eo...@apache.org on 2020/01/30 18:59:37 UTC

[zookeeper] branch fix/ZOOKEEPER-3695-part2 created (now 8a04f1b)

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

eolivelli pushed a change to branch fix/ZOOKEEPER-3695-part2
in repository https://gitbox.apache.org/repos/asf/zookeeper.git.


      at 8a04f1b  ZOOKEEPER-3695: Source release tarball does not match repository in 3.6.0 - part2 - upgrade to Apache Parent 23 - disable maven remote plugin - move source assembly execution before sources generation - move git properties resolution to the correct phase

This branch includes the following new commits:

     new 8a04f1b  ZOOKEEPER-3695: Source release tarball does not match repository in 3.6.0 - part2 - upgrade to Apache Parent 23 - disable maven remote plugin - move source assembly execution before sources generation - move git properties resolution to the correct phase

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[zookeeper] 01/01: ZOOKEEPER-3695: Source release tarball does not match repository in 3.6.0 - part2 - upgrade to Apache Parent 23 - disable maven remote plugin - move source assembly execution before sources generation - move git properties resolution to the correct phase

Posted by eo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

eolivelli pushed a commit to branch fix/ZOOKEEPER-3695-part2
in repository https://gitbox.apache.org/repos/asf/zookeeper.git

commit 8a04f1b277318aa5e6e1526f5e1c171a08d4e8b5
Author: Enrico Olivelli <eo...@apache.org>
AuthorDate: Thu Jan 30 19:58:26 2020 +0100

    ZOOKEEPER-3695: Source release tarball does not match repository in 3.6.0 - part2
    - upgrade to Apache Parent 23
    - disable maven remote plugin
    - move source assembly execution before sources generation
    - move git properties resolution to the correct phase
---
 pom.xml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5c0dde5..00bf89a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>21</version>
+    <version>23</version>
     <relativePath />
     <!-- no parent resolution -->
   </parent>
@@ -284,7 +284,7 @@
                     <executions>
                         <execution>
                             <id>source-release-assembly-tar-gz</id>
-                            <phase>package</phase>
+                            <phase>initialize</phase>
                             <goals>
                                 <goal>single</goal>
                             </goals>
@@ -665,6 +665,16 @@
             </execution>
           </executions>
         </plugin>
+        <!-- we don't need this plugin-->
+        <plugin>
+          <artifactId>maven-remote-resources-plugin</artifactId>
+          <executions>
+            <execution>
+               <id>process-resource-bundles</id>
+               <phase>none</phase>
+            </execution>
+          </executions>
+        </plugin>
       </plugins>
     </pluginManagement>
 
@@ -678,7 +688,7 @@
             <goals>
               <goal>revision</goal>
             </goals>
-            <phase>validate</phase>
+            <phase>generate-resources</phase>
           </execution>
         </executions>
         <configuration>