This is an automated email from the ASF dual-hosted git repository.
eolivelli pushed a commit to branch release-3.6.0
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/release-3.6.0 by this push:
new fbcc6a0 ZOOKEEPER-3695: Source release tarball does not match
repository in 3.6.0 - part2
fbcc6a0 is described below
commit fbcc6a08555672a5b671febe880f10a5902a8286
Author: Enrico Olivelli <[email protected]>
AuthorDate: Sat Feb 1 12:08:39 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
Author: Enrico Olivelli <[email protected]>
Reviewers: Norbert Kalmar <[email protected]>
Closes #1238 from eolivelli/fix/ZOOKEEPER-3695-part2
(cherry picked from commit d3ce1fa7e0b9804fb7752cbb3818c03341d8c87e)
Signed-off-by: Enrico Olivelli <[email protected]>
---
pom.xml | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 070faf7..28a120a 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>
@@ -664,6 +664,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>
@@ -677,7 +687,7 @@
<goals>
<goal>revision</goal>
</goals>
- <phase>validate</phase>
+ <phase>generate-resources</phase>
</execution>
</executions>
<configuration>
