Repository: hadoop Updated Branches: refs/heads/trunk 9b899f1eb -> a4b9b7c13
HDDS-702:Used fixed/external version from hadoop jars in hdds/ozone projects. Contributed by Elek Marton. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a4b9b7c1 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a4b9b7c1 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a4b9b7c1 Branch: refs/heads/trunk Commit: a4b9b7c1302b886279960c2817be3d198347d92e Parents: 9b899f1 Author: Bharat Viswanadham <[email protected]> Authored: Thu Oct 25 16:26:48 2018 -0700 Committer: Bharat Viswanadham <[email protected]> Committed: Thu Oct 25 16:26:48 2018 -0700 ---------------------------------------------------------------------- hadoop-hdds/pom.xml | 161 +++++++++++++++++++++++++++++++++++++++++++- hadoop-ozone/pom.xml | 139 +++++++++++++++++++++++++++++++++++++- hadoop-project/pom.xml | 158 ------------------------------------------- pom.xml | 2 - 4 files changed, 295 insertions(+), 165 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a4b9b7c1/hadoop-hdds/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml index a5fb32d..bedf78d 100644 --- a/hadoop-hdds/pom.xml +++ b/hadoop-hdds/pom.xml @@ -19,9 +19,9 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-project-dist</artifactId> - <version>3.3.0-SNAPSHOT</version> - <relativePath>../hadoop-project-dist</relativePath> + <artifactId>hadoop-project</artifactId> + <version>3.2.1-SNAPSHOT</version> + <relativePath/> </parent> <artifactId>hadoop-hdds</artifactId> @@ -40,6 +40,143 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> </modules> + <properties> + <!-- version for hdds/ozone components --> + <hdds.version>0.4.0-SNAPSHOT</hdds.version> + + <!-- Apache Ratis version --> + <ratis.version>0.3.0-aa38160-SNAPSHOT</ratis.version> + + <bouncycastle.version>1.60</bouncycastle.version> + + <protobuf-maven-plugin.version>0.5.1</protobuf-maven-plugin.version> + <os-maven-plugin.version>1.5.0.Final</os-maven-plugin.version> + + + </properties> + <repositories> + <repository> + <id>apache.snapshots.https</id> + <url>https://repository.apache.org/content/repositories/snapshots</url> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>apache.snapshots.https</id> + <url>https://repository.apache.org/content/repositories/snapshots</url> + </pluginRepository> + </pluginRepositories> + <dependencyManagement> + <dependencies> + + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdds-common</artifactId> + <version>${hdds.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdds-client</artifactId> + <version>${hdds.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdds-tools</artifactId> + <version>${hdds.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdds-server-framework</artifactId> + <version>${hdds.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdds-server-scm</artifactId> + <version>${hdds.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdds-container-service</artifactId> + <version>${hdds.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdds-container-service</artifactId> + <version>${hdds.version}</version> + <type>test-jar</type> + </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdds-server-scm</artifactId> + <type>test-jar</type> + <version>${hdds.version}</version> + </dependency> + + <dependency> + <groupId>org.openjdk.jmh</groupId> + <artifactId>jmh-core</artifactId> + <version>1.19</version> + </dependency> + + <dependency> + <groupId>org.openjdk.jmh</groupId> + <artifactId>jmh-generator-annprocess</artifactId> + <version>1.19</version> + </dependency> + + <dependency> + <groupId>org.apache.ratis</groupId> + <artifactId>ratis-proto-shaded</artifactId> + <version>${ratis.version}</version> + </dependency> + <dependency> + <artifactId>ratis-common</artifactId> + <groupId>org.apache.ratis</groupId> + <version>${ratis.version}</version> + </dependency> + <dependency> + <artifactId>ratis-client</artifactId> + <groupId>org.apache.ratis</groupId> + <version>${ratis.version}</version> + </dependency> + <dependency> + <artifactId>ratis-server</artifactId> + <groupId>org.apache.ratis</groupId> + <version>${ratis.version}</version> + </dependency> + <dependency> + <artifactId>ratis-netty</artifactId> + <groupId>org.apache.ratis</groupId> + <version>${ratis.version}</version> + </dependency> + <dependency> + <artifactId>ratis-grpc</artifactId> + <groupId>org.apache.ratis</groupId> + <version>${ratis.version}</version> + </dependency> + + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + <version>${bouncycastle.version}</version> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpkix-jdk15on</artifactId> + <version>${bouncycastle.version}</version> + </dependency> + + + </dependencies> + </dependencyManagement> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> @@ -88,7 +225,25 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> </dependencies> <build> <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>depcheck</id> + <configuration> + <rules> + <DependencyConvergence> + <uniqueVersions>false</uniqueVersions> + </DependencyConvergence> + </rules> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> <configuration> http://git-wip-us.apache.org/repos/asf/hadoop/blob/a4b9b7c1/hadoop-ozone/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml index 0e02922..5e53134 100644 --- a/hadoop-ozone/pom.xml +++ b/hadoop-ozone/pom.xml @@ -20,8 +20,8 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-project</artifactId> - <version>3.3.0-SNAPSHOT</version> - <relativePath>../hadoop-project</relativePath> + <version>3.2.1-SNAPSHOT</version> + <relativePath/> </parent> <artifactId>hadoop-ozone</artifactId> <version>0.4.0-SNAPSHOT</version> @@ -30,9 +30,15 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> <packaging>pom</packaging> <properties> + <hadoop.version>3.2.1-SNAPSHOT</hadoop.version> + <hdds.version>0.4.0-SNAPSHOT</hdds.version> <ozone.version>0.4.0-SNAPSHOT</ozone.version> + <ratis.version>0.3.0-aa38160-SNAPSHOT</ratis.version> + <bouncycastle.version>1.60</bouncycastle.version> <ozone.release>Badlands</ozone.release> <declared.ozone.version>${ozone.version}</declared.ozone.version> + + </properties> <modules> <module>common</module> @@ -48,6 +54,119 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> <module>docs</module> </modules> + <repositories> + <repository> + <id>apache.snapshots.https</id> + <url>https://repository.apache.org/content/repositories/snapshots</url> + </repository> + </repositories> + + <dependencyManagement> + + <dependencies> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-ozone-common</artifactId> + <version>${ozone.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-ozone-client</artifactId> + <version>${ozone.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-ozone-ozone-manager</artifactId> + <version>${ozone.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-ozone-objectstore-service</artifactId> + <version>${ozone.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-ozone-s3gateway</artifactId> + <version>${ozone.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-ozone-datanode</artifactId> + <version>${ozone.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-ozone-tools</artifactId> + <version>${ozone.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-ozone-filesystem</artifactId> + <version>${ozone.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-ozone-integration-test</artifactId> + <version>${ozone.version}</version> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-ozone-ozone-manager</artifactId> + <version>${ozone.version}</version> + <type>test-jar</type> + </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdds-common</artifactId> + <version>${hdds.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdds-server-framework</artifactId> + <version>${hdds.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdds-server-scm</artifactId> + <version>${hdds.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdds-container-service</artifactId> + <version>${hdds.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdds-client</artifactId> + <version>${hdds.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdds-tools</artifactId> + <version>${hdds.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdds-container-service</artifactId> + <version>${hdds.version}</version> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdds-server-scm</artifactId> + <type>test-jar</type> + <version>${hdds.version}</version> + </dependency> + + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + <version>${bouncycastle.version}</version> + </dependency> + </dependencies> + </dependencyManagement> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> @@ -119,6 +238,22 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>depcheck</id> + <configuration> + <rules> + <DependencyConvergence> + <uniqueVersions>false</uniqueVersions> + </DependencyConvergence> + </rules> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> <configuration> http://git-wip-us.apache.org/repos/asf/hadoop/blob/a4b9b7c1/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index e9c5c0f..963d24b 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -102,8 +102,6 @@ <apacheds.version>2.0.0-M21</apacheds.version> <ldap-api.version>1.0.0-M33</ldap-api.version> - <!-- Apache Ratis version --> - <ratis.version>0.3.0-aa38160-SNAPSHOT</ratis.version> <jcache.version>1.0-alpha-1</jcache.version> <ehcache.version>3.3.1</ehcache.version> <hikari.version>2.4.12</hikari.version> @@ -582,132 +580,6 @@ <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-ozone</artifactId> - <version>${hdds.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-ozone-objectstore-service</artifactId> - <version>${hdds.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-ozone-docs</artifactId> - <version>${hdds.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-ozone-filesystem</artifactId> - <version>${hdds.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdds-common</artifactId> - <version>${hdds.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdds-client</artifactId> - <version>${hdds.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdds-tools</artifactId> - <version>${hdds.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-ozone-tools</artifactId> - <version>${hdds.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-ozone-datanode</artifactId> - <version>${hdds.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-ozone-s3gateway</artifactId> - <version>${hdds.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-ozone-integration-test</artifactId> - <version>${hdds.version}</version> - <type>test-jar</type> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdds-server-framework</artifactId> - <version>${hdds.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdds-server-scm</artifactId> - <version>${hdds.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdds-container-service</artifactId> - <version>${hdds.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdds-container-service</artifactId> - <version>${hdds.version}</version> - <type>test-jar</type> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdds-server-scm</artifactId> - <type>test-jar</type> - <version>${hdds.version}</version> - </dependency> - - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-ozone-common</artifactId> - <version>${hdds.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-ozone-ozone-manager</artifactId> - <version>${hdds.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-ozone-ozone-manager</artifactId> - <version>${hdds.version}</version> - <type>test-jar</type> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-ozone-client</artifactId> - <version>${hdds.version}</version> - </dependency> - - <dependency> - <groupId>org.openjdk.jmh</groupId> - <artifactId>jmh-core</artifactId> - <version>1.19</version> - </dependency> - <dependency> - <groupId>org.openjdk.jmh</groupId> - <artifactId>jmh-generator-annprocess</artifactId> - <version>1.19</version> - </dependency> - - - <dependency> - <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-kms</artifactId> <version>${hadoop.version}</version> </dependency> @@ -931,36 +803,6 @@ </exclusions> </dependency> - <dependency> - <groupId>org.apache.ratis</groupId> - <artifactId>ratis-proto-shaded</artifactId> - <version>${ratis.version}</version> - </dependency> - <dependency> - <artifactId>ratis-common</artifactId> - <groupId>org.apache.ratis</groupId> - <version>${ratis.version}</version> - </dependency> - <dependency> - <artifactId>ratis-client</artifactId> - <groupId>org.apache.ratis</groupId> - <version>${ratis.version}</version> - </dependency> - <dependency> - <artifactId>ratis-server</artifactId> - <groupId>org.apache.ratis</groupId> - <version>${ratis.version}</version> - </dependency> - <dependency> - <artifactId>ratis-netty</artifactId> - <groupId>org.apache.ratis</groupId> - <version>${ratis.version}</version> - </dependency> - <dependency> - <artifactId>ratis-grpc</artifactId> - <groupId>org.apache.ratis</groupId> - <version>${ratis.version}</version> - </dependency> <dependency> <groupId>io.netty</groupId> http://git-wip-us.apache.org/repos/asf/hadoop/blob/a4b9b7c1/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 5e81573..327fcdd 100644 --- a/pom.xml +++ b/pom.xml @@ -116,8 +116,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs <shell-executable>bash</shell-executable> - <!-- version for hdds/ozone components --> - <hdds.version>0.4.0-SNAPSHOT</hdds.version> </properties> <modules> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
