Просмотр исходного кода

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 <eolivelli@apache.org>

Reviewers: Norbert Kalmar <nkalmar@apache.org>

Closes #1238 from eolivelli/fix/ZOOKEEPER-3695-part2
Enrico Olivelli 5 лет назад
Родитель
Сommit
d3ce1fa7e0
1 измененных файлов с 13 добавлено и 3 удалено
  1. 13 3
      pom.xml

+ 13 - 3
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>