You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by aa...@apache.org on 2019/08/07 00:30:40 UTC
[hadoop] branch trunk updated: HADOOP-15908. hadoop-build-tools jar
is downloaded from remote repository instead of using from local.
Contributed by Oleksandr Shevchenko.
This is an automated email from the ASF dual-hosted git repository.
aajisaka pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 0b0ba70 HADOOP-15908. hadoop-build-tools jar is downloaded from remote repository instead of using from local. Contributed by Oleksandr Shevchenko.
0b0ba70 is described below
commit 0b0ba70b35d1c1c774d69f5682f24967d40009a8
Author: Akira Ajisaka <aa...@apache.org>
AuthorDate: Wed Aug 7 09:28:57 2019 +0900
HADOOP-15908. hadoop-build-tools jar is downloaded from remote repository instead of using from local. Contributed by Oleksandr Shevchenko.
---
hadoop-project/pom.xml | 54 ++++++++++++++++++++++++++++----------------------
1 file changed, 30 insertions(+), 24 deletions(-)
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 7512260..8b32c40 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -1738,30 +1738,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>${maven-remote-resources-plugin.version}</version>
- <configuration>
- <resourceBundles>
- <resourceBundle>org.apache.hadoop:hadoop-build-tools:${hadoop.version}</resourceBundle>
- </resourceBundles>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-build-tools</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -2010,6 +1986,36 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>resource-bundle</id>
+ <!-- activate profile only when we build the whole project from project root directory -->
+ <activation>
+ <file>
+ <exists>${env.PWD}/LICENSE.txt</exists>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>${maven-remote-resources-plugin.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+ <resourceBundle>org.apache.hadoop:hadoop-build-tools:${hadoop.version}</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
<!-- The profile for building against HBase 1.2.x
This is the default.
-->
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org