Repository: incubator-ratis Updated Branches: refs/heads/master e35d954e3 -> f6814c6b4
RATIS-335 Use the new ratis-thirdparty-hadoop artifact Project: http://git-wip-us.apache.org/repos/asf/incubator-ratis/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ratis/commit/f6814c6b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ratis/tree/f6814c6b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ratis/diff/f6814c6b Branch: refs/heads/master Commit: f6814c6b46a54a787983a4245121ee35a9cad0b8 Parents: e35d954 Author: Josh Elser <[email protected]> Authored: Wed Sep 26 22:33:51 2018 -0400 Committer: Josh Elser <[email protected]> Committed: Thu Oct 4 14:16:43 2018 -0400 ---------------------------------------------------------------------- pom.xml | 12 +-- ratis-examples/pom.xml | 2 +- ratis-hadoop-shaded/pom.xml | 182 --------------------------------------- ratis-hadoop/pom.xml | 2 +- ratis-logservice/pom.xml | 2 +- 5 files changed, 9 insertions(+), 191 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/f6814c6b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 123aeb2..b5c7bdd 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,6 @@ <module>ratis-grpc</module> <module>ratis-netty</module> - <module>ratis-hadoop-shaded</module> <module>ratis-hadoop</module> <module>ratis-assembly</module> @@ -256,11 +255,6 @@ <type>test-jar</type> <scope>test</scope> </dependency> - <dependency> - <artifactId>ratis-hadoop-shaded</artifactId> - <groupId>org.apache.ratis</groupId> - <version>${project.version}</version> - </dependency> <dependency> <artifactId>ratis-netty</artifactId> @@ -319,6 +313,12 @@ <version>${ratis.thirdparty.version}</version> </dependency> + <dependency> + <groupId>org.apache.ratis</groupId> + <artifactId>ratis-thirdparty-hadoop</artifactId> + <version>${ratis.thirdparty.version}</version> + </dependency> + <!-- External dependencies --> <dependency> <groupId>org.slf4j</groupId> http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/f6814c6b/ratis-examples/pom.xml ---------------------------------------------------------------------- diff --git a/ratis-examples/pom.xml b/ratis-examples/pom.xml index 16cb5b7..52839dd 100644 --- a/ratis-examples/pom.xml +++ b/ratis-examples/pom.xml @@ -82,7 +82,7 @@ <type>test-jar</type> </dependency> <dependency> - <artifactId>ratis-hadoop-shaded</artifactId> + <artifactId>ratis-thirdparty-hadoop</artifactId> <groupId>org.apache.ratis</groupId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/f6814c6b/ratis-hadoop-shaded/pom.xml ---------------------------------------------------------------------- diff --git a/ratis-hadoop-shaded/pom.xml b/ratis-hadoop-shaded/pom.xml deleted file mode 100644 index 28fdd43..0000000 --- a/ratis-hadoop-shaded/pom.xml +++ /dev/null @@ -1,182 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - 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 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>ratis</artifactId> - <groupId>org.apache.ratis</groupId> - <version>0.3.0-SNAPSHOT</version> - </parent> - - <artifactId>ratis-hadoop-shaded</artifactId> - <name>Apache Ratis Hadoop Shaded</name> - - <properties> - <maven.javadoc.skip>true</maven.javadoc.skip> - - <!--Version of Hadoop to be shaded --> - <shaded.hadoop.version>${hadoop.version}</shaded.hadoop.version> - </properties> - - <build> - <plugins> - <plugin> - <!--Make it so assembly:single does nothing in here--> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <skipAssembly>true</skipAssembly> - </configuration> - </plugin> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <!-- Replace the "default" jar-plugin execution --> - <!-- This is a super-dirty hack to work around Yetus - PreCommit not using the package lifecycle phase --> - <id>default-jar</id> - <phase>process-classes</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <executions> - <execution> - <phase>process-classes</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <shadeSourcesContent>true</shadeSourcesContent> - <createSourcesJar>true</createSourcesJar> - <!-- Replace the original artifact which is no good on its own --> - <shadedArtifactAttached>false</shadedArtifactAttached> - <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation> - <!-- Using shade-plugin to relocate hadoop's protobuf dependency and find it in ratis-thirdparty. - So dirty. --> - <relocations> - <relocation> - <pattern>com.google.protobuf</pattern> - <shadedPattern>org.apache.ratis.thirdparty.com.google.protobuf</shadedPattern> - </relocation> - <relocation> - <pattern>org.apache.hadoop.ipc.protobuf</pattern> - <shadedPattern>org.apache.ratis.shaded.org.apache.hadoop.ipc.protobuf</shadedPattern> - </relocation> - </relocations> - - <filters> - <filter> - <artifact>org.apache.hadoop:hadoop-common</artifact> - <includes> - <include>org/apache/hadoop/ipc/protobuf/**</include> - </includes> - </filter> - </filters> - - <artifactSet> - <includes> - <!-- Must list explicitly, otherwise we pull in all of hadoop-common's - transitive dependencies. --> - <include>org.apache.hadoop:hadoop-common</include> - <include>com.google.j2objc:j2objc-annotations</include> - <include>com.google.errorprone:error_prone_annotations</include> - <include>org.codehaus.mojo:animal-sniffer-annotations</include> - </includes> - </artifactSet> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - <pluginManagement> - <plugins> - <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <versionRange>[3.1.1,)</versionRange> - <goals> - <goal>shade</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore/> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - - <dependencies> - <dependency> - <groupId>org.apache.ratis</groupId> - <artifactId>ratis-thirdparty</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <version>${shaded.hadoop.version}</version> - </dependency> - <dependency> - <groupId>com.google.errorprone</groupId> - <artifactId>error_prone_annotations</artifactId> - <version>2.2.0</version> - </dependency> - <dependency> - <groupId>com.google.j2objc</groupId> - <artifactId>j2objc-annotations</artifactId> - <version>1.3</version> - </dependency> - <dependency> - <groupId>org.codehaus.mojo</groupId> - <artifactId>animal-sniffer-annotations</artifactId> - <version>1.16</version> - </dependency> - </dependencies> - - <profiles> - <profile> - <id>compile-protobuf</id> - <!-- - Shade and drop the generated java files under target/shaded-sources. - Run this profile/step everytime you change proto - files or update the protobuf version. - --> - <activation> - <property> - <name>!skipShade</name> - </property> - </activation> - </profile> - </profiles> -</project> http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/f6814c6b/ratis-hadoop/pom.xml ---------------------------------------------------------------------- diff --git a/ratis-hadoop/pom.xml b/ratis-hadoop/pom.xml index c98fe26..a21407f 100644 --- a/ratis-hadoop/pom.xml +++ b/ratis-hadoop/pom.xml @@ -29,7 +29,7 @@ <groupId>org.apache.ratis</groupId> </dependency> <dependency> - <artifactId>ratis-hadoop-shaded</artifactId> + <artifactId>ratis-thirdparty-hadoop</artifactId> <groupId>org.apache.ratis</groupId> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/f6814c6b/ratis-logservice/pom.xml ---------------------------------------------------------------------- diff --git a/ratis-logservice/pom.xml b/ratis-logservice/pom.xml index 16ff962..a3c114d 100644 --- a/ratis-logservice/pom.xml +++ b/ratis-logservice/pom.xml @@ -97,7 +97,7 @@ <type>test-jar</type> </dependency> <dependency> - <artifactId>ratis-hadoop-shaded</artifactId> + <artifactId>ratis-thirdparty-hadoop</artifactId> <groupId>org.apache.ratis</groupId> <scope>test</scope> </dependency>
