This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new c28e16ec68 HDDS-11950. Enable sortpom in dev-support module. (#7586)
c28e16ec68 is described below
commit c28e16ec6812197f13b1586cac1c81b53c6fa53c
Author: Nandakumar Vadivelu <[email protected]>
AuthorDate: Tue Dec 17 21:54:13 2024 +0530
HDDS-11950. Enable sortpom in dev-support module. (#7586)
---
dev-support/pom.xml | 31 ++++++++++++++-----------------
1 file changed, 14 insertions(+), 17 deletions(-)
diff --git a/dev-support/pom.xml b/dev-support/pom.xml
index 9c4a55eb6d..ed656fcc20 100644
--- a/dev-support/pom.xml
+++ b/dev-support/pom.xml
@@ -12,28 +12,25 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>ozone-main</artifactId>
<groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-main</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>ozone-dev-support</artifactId>
- <description>Helper module for sharing resources among projects</description>
<name>Apache Ozone Dev Support</name>
+ <description>Helper module for sharing resources among projects</description>
<properties>
<failIfNoTests>false</failIfNoTests>
- <sort.skip>true</sort.skip>
</properties>
<build>
<resources>
<resource>
- <directory>${project.build.directory}/extra-resources</directory>
<targetPath>META-INF</targetPath>
+ <directory>${project.build.directory}/extra-resources</directory>
<includes>
<include>LICENSE.txt</include>
<include>NOTICE.txt</include>
@@ -55,10 +52,10 @@
<executions>
<execution>
<id>copy-resources</id>
- <phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
+ <phase>validate</phase>
<configuration>
<outputDirectory>${project.build.directory}/extra-resources</outputDirectory>
<resources>
@@ -78,14 +75,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-resources</phase>
- <goals>
- <goal>bundle</goal>
- </goals>
- </execution>
- </executions>
<configuration>
<resourcesDirectory>${project.build.outputDirectory}</resourcesDirectory>
<includes>
@@ -93,6 +82,14 @@
<include>META-INF/NOTICE.txt</include>
</includes>
</configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ <phase>process-resources</phase>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
