Skip to content

Commit 247daf0

Browse files
mukund-thakurmukund-thakur
committed
HADOOP-19087. Preparing for 3.4.1 development
1 parent 071440c commit 247daf0

File tree

230 files changed

+29217
-211
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

230 files changed

+29217
-211
lines changed

‎hadoop-assemblies/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
<parent>
2424
<groupId>org.apache.hadoop</groupId>
2525
<artifactId>hadoop-project</artifactId>
26-
<version>3.4.1-SNAPSHOT</version>
26+
<version>3.4.1</version>
2727
<relativePath>../hadoop-project</relativePath>
2828
</parent>
2929
<artifactId>hadoop-assemblies</artifactId>
30-
<version>3.4.1-SNAPSHOT</version>
30+
<version>3.4.1</version>
3131
<name>Apache Hadoop Assemblies</name>
3232
<description>Apache Hadoop Assemblies</description>
3333

‎hadoop-assemblies/pom.xml.versionsBackup‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Licensed to the Apache Software Foundation (ASF) under one or more
4+
contributor license agreements. See the NOTICE file distributed with
5+
this work for additional information regarding copyright ownership.
6+
The ASF licenses this file to You under the Apache License, Version 2.0
7+
(the "License"); you may not use this file except in compliance with
8+
the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
-->
18+
<project xmlns="http://maven.apache.org/POM/4.0.0"
19+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
21+
https://maven.apache.org/xsd/maven-4.0.0.xsd">
22+
<modelVersion>4.0.0</modelVersion>
23+
<parent>
24+
<groupId>org.apache.hadoop</groupId>
25+
<artifactId>hadoop-project</artifactId>
26+
<version>3.4.1-SNAPSHOT</version>
27+
<relativePath>../hadoop-project</relativePath>
28+
</parent>
29+
<artifactId>hadoop-assemblies</artifactId>
30+
<version>3.4.1-SNAPSHOT</version>
31+
<name>Apache Hadoop Assemblies</name>
32+
<description>Apache Hadoop Assemblies</description>
33+
34+
<properties>
35+
<failIfNoTests>false</failIfNoTests>
36+
</properties>
37+
38+
<build>
39+
<plugins>
40+
<plugin>
41+
<groupId>org.apache.maven.plugins</groupId>
42+
<artifactId>maven-enforcer-plugin</artifactId>
43+
<inherited>false</inherited>
44+
<configuration>
45+
<rules>
46+
<requireMavenVersion>
47+
<version>${enforced.maven.version}</version>
48+
</requireMavenVersion>
49+
<requireJavaVersion>
50+
<version>${enforced.java.version}</version>
51+
</requireJavaVersion>
52+
</rules>
53+
</configuration>
54+
<executions>
55+
<execution>
56+
<id>clean</id>
57+
<goals>
58+
<goal>enforce</goal>
59+
</goals>
60+
<phase>pre-clean</phase>
61+
</execution>
62+
<execution>
63+
<id>default</id>
64+
<goals>
65+
<goal>enforce</goal>
66+
</goals>
67+
<phase>validate</phase>
68+
</execution>
69+
<execution>
70+
<id>site</id>
71+
<goals>
72+
<goal>enforce</goal>
73+
</goals>
74+
<phase>pre-site</phase>
75+
</execution>
76+
</executions>
77+
</plugin>
78+
<plugin>
79+
<groupId>org.apache.rat</groupId>
80+
<artifactId>apache-rat-plugin</artifactId>
81+
</plugin>
82+
</plugins>
83+
</build>
84+
</project>

‎hadoop-build-tools/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<parent>
1919
<artifactId>hadoop-main</artifactId>
2020
<groupId>org.apache.hadoop</groupId>
21-
<version>3.4.1-SNAPSHOT</version>
21+
<version>3.4.1</version>
2222
</parent>
2323
<modelVersion>4.0.0</modelVersion>
2424
<artifactId>hadoop-build-tools</artifactId>

‎hadoop-build-tools/pom.xml.versionsBackup‎

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at
6+
7+
http://www.apache.org/licenses/LICENSE-2.0
8+
9+
Unless required by applicable law or agreed to in writing, software
10+
distributed under the License is distributed on an "AS IS" BASIS,
11+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
See the License for the specific language governing permissions and
13+
limitations under the License. See accompanying LICENSE file.
14+
-->
15+
<project xmlns="http://maven.apache.org/POM/4.0.0"
16+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
17+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
18+
<parent>
19+
<artifactId>hadoop-main</artifactId>
20+
<groupId>org.apache.hadoop</groupId>
21+
<version>3.4.1-SNAPSHOT</version>
22+
</parent>
23+
<modelVersion>4.0.0</modelVersion>
24+
<artifactId>hadoop-build-tools</artifactId>
25+
<description>Apache Hadoop Build Tools Project</description>
26+
<name>Apache Hadoop Build Tools</name>
27+
28+
<properties>
29+
<failIfNoTests>false</failIfNoTests>
30+
</properties>
31+
<build>
32+
<resources>
33+
<resource>
34+
<directory>${project.basedir}/target/extra-resources</directory>
35+
<targetPath>META-INF</targetPath>
36+
<includes>
37+
<include>LICENSE.txt</include>
38+
<include>NOTICE.txt</include>
39+
</includes>
40+
</resource>
41+
<resource>
42+
<directory>${project.basedir}/src/main/resources</directory>
43+
</resource>
44+
</resources>
45+
<plugins>
46+
<plugin>
47+
<groupId>org.apache.maven.plugins</groupId>
48+
<artifactId>maven-site-plugin</artifactId>
49+
<configuration>
50+
<skip>true</skip>
51+
</configuration>
52+
</plugin>
53+
<!-- copy L&N files to target/extra-resources -->
54+
<plugin>
55+
<groupId>org.apache.maven.plugins</groupId>
56+
<artifactId>maven-resources-plugin</artifactId>
57+
<version>${maven-resources-plugin.version}</version>
58+
<executions>
59+
<execution>
60+
<id>copy-resources</id>
61+
<phase>validate</phase>
62+
<goals>
63+
<goal>copy-resources</goal>
64+
</goals>
65+
<configuration>
66+
<outputDirectory>${project.basedir}/target/extra-resources</outputDirectory>
67+
<resources>
68+
<resource>
69+
<directory>../</directory>
70+
<includes>
71+
<include>LICENSE.txt</include>
72+
<include>NOTICE.txt</include>
73+
</includes>
74+
</resource>
75+
</resources>
76+
</configuration>
77+
</execution>
78+
</executions>
79+
</plugin>
80+
<!-- add entries for L&N files to remote-resources.xml in jar file -->
81+
<plugin>
82+
<groupId>org.apache.maven.plugins</groupId>
83+
<artifactId>maven-remote-resources-plugin</artifactId>
84+
<version>${maven-remote-resources-plugin.version}</version>
85+
<executions>
86+
<execution>
87+
<phase>process-resources</phase>
88+
<goals>
89+
<goal>bundle</goal>
90+
</goals>
91+
</execution>
92+
</executions>
93+
<configuration>
94+
<resourcesDirectory>${project.build.outputDirectory}</resourcesDirectory>
95+
<includes>
96+
<include>META-INF/LICENSE.txt</include>
97+
<include>META-INF/NOTICE.txt</include>
98+
</includes>
99+
</configuration>
100+
</plugin>
101+
<plugin>
102+
<groupId>org.apache.maven.plugins</groupId>
103+
<artifactId>maven-antrun-plugin</artifactId>
104+
<executions>
105+
<execution>
106+
<id>dummy</id>
107+
<phase>validate</phase>
108+
<goals>
109+
<goal>run</goal>
110+
</goals>
111+
</execution>
112+
</executions>
113+
</plugin>
114+
<plugin>
115+
<groupId>org.apache.rat</groupId>
116+
<artifactId>apache-rat-plugin</artifactId>
117+
<configuration>
118+
<excludes>
119+
<exclude>maven-eclipse.xml</exclude>
120+
<exclude>.externalToolBuilders/Maven_Ant_Builder.launch</exclude>
121+
</excludes>
122+
</configuration>
123+
</plugin>
124+
</plugins>
125+
</build>
126+
</project>

‎hadoop-client-modules/hadoop-client-api/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
<parent>
1919
<groupId>org.apache.hadoop</groupId>
2020
<artifactId>hadoop-project</artifactId>
21-
<version>3.4.1-SNAPSHOT</version>
21+
<version>3.4.1</version>
2222
<relativePath>../../hadoop-project</relativePath>
2323
</parent>
2424
<artifactId>hadoop-client-api</artifactId>
25-
<version>3.4.1-SNAPSHOT</version>
25+
<version>3.4.1</version>
2626
<packaging>jar</packaging>
2727

2828
<description>Apache Hadoop Client</description>

0 commit comments

Comments
 (0)