Skip to content

Commit 114042c

Browse files
authored
Porg HDDS-8993 to Ozone 1.3 branch (#13)
1 parent 2a24414 commit 114042c

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

hadoop-hdds/interface-client/pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,12 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
130130
</plugin>
131131
<plugin>
132132
<artifactId>maven-antrun-plugin</artifactId>
133+
<version>${maven-antrun-plugin.version}</version>
133134
<executions>
134135
<execution>
135136
<phase>generate-sources</phase>
136137
<configuration>
137-
<tasks>
138+
<target>
138139
<replace token="com.google.protobuf"
139140
value="org.apache.ratis.thirdparty.com.google.protobuf"
140141
dir="target/generated-sources/java/org/apache/hadoop/hdds/protocol/datanode/proto">
@@ -159,7 +160,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
159160
tofile="target/generated-sources/java/proto3/org/apache/hadoop/hdds/protocol/proto3"/>
160161
<move file="target/generated-sources/java/proto3"
161162
tofile="target/generated-sources/java"/>
162-
</tasks>
163+
</target>
163164
</configuration>
164165
<goals>
165166
<goal>run</goal>

hadoop-hdds/interface-server/pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,12 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
101101
</plugin>
102102
<plugin>
103103
<artifactId>maven-antrun-plugin</artifactId>
104+
<version>${maven-antrun-plugin.version}</version>
104105
<executions>
105106
<execution>
106107
<phase>generate-sources</phase>
107108
<configuration>
108-
<tasks>
109+
<target>
109110
<replace token="com.google.protobuf"
110111
value="org.apache.ratis.thirdparty.com.google.protobuf"
111112
dir="target/generated-sources/java/org/apache/hadoop/hdds/protocol/scm/proto">
@@ -118,7 +119,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
118119
value="org.apache.ratis.thirdparty.com.google.common"
119120
dir="target/generated-sources/java/org/apache/hadoop/hdds/protocol/scm/proto">
120121
</replace>
121-
</tasks>
122+
</target>
122123
</configuration>
123124
<goals>
124125
<goal>run</goal>

hadoop-ozone/interface-client/pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,12 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
112112
</plugin>
113113
<plugin>
114114
<artifactId>maven-antrun-plugin</artifactId>
115+
<version>${maven-antrun-plugin.version}</version>
115116
<executions>
116117
<execution>
117118
<phase>generate-sources</phase>
118119
<configuration>
119-
<tasks>
120+
<target>
120121
<replace token="com.google.protobuf"
121122
value="org.apache.hadoop.thirdparty.protobuf"
122123
dir="target/generated-sources/protobuf/java/proto3/org/apache/hadoop/ozone/protocol/proto">
@@ -147,7 +148,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
147148
tofile="target/generated-sources/protobuf/java/proto3/org/apache/hadoop/ozone/security/proto3"/>
148149
<move file="target/generated-sources/protobuf/java/proto3"
149150
tofile="target/generated-sources/protobuf/java/"/>
150-
</tasks>
151+
</target>
151152
</configuration>
152153
<goals>
153154
<goal>run</goal>

pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
239239
<native-maven-plugin.version>1.0-alpha-8</native-maven-plugin.version>
240240
<maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
241241
<maven-site-plugin.version>3.9.1</maven-site-plugin.version>
242+
<maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
242243
<checkstyle.version>9.3</checkstyle.version>
243244
<surefire.fork.timeout>1200</surefire.fork.timeout>
244245
<aws-java-sdk.version>1.12.261</aws-java-sdk.version>
@@ -1910,6 +1911,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
19101911
<plugin>
19111912
<groupId>org.apache.maven.plugins</groupId>
19121913
<artifactId>maven-antrun-plugin</artifactId>
1914+
<version>${maven-antrun-plugin.version}</version>
19131915
<executions>
19141916
<execution>
19151917
<id>create-testdirs</id>

0 commit comments

Comments
 (0)