Repository: incubator-ratis Updated Branches: refs/heads/master 67db67efd -> 0b73e892a
RATIS-299. Error when running start-all.sh in ratis-examples. Contributed by Jing Chen Project: http://git-wip-us.apache.org/repos/asf/incubator-ratis/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ratis/commit/0b73e892 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ratis/tree/0b73e892 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ratis/diff/0b73e892 Branch: refs/heads/master Commit: 0b73e892afc99562ba15df0518303e918dce3c08 Parents: 67db67e Author: Tsz Wo Nicholas Sze <[email protected]> Authored: Tue Aug 14 10:37:45 2018 -0700 Committer: Tsz Wo Nicholas Sze <[email protected]> Committed: Tue Aug 14 10:37:45 2018 -0700 ---------------------------------------------------------------------- ratis-assembly/src/main/resources/NOTICE | 8 -------- ratis-examples/pom.xml | 10 ++++++++++ ratis-proto-shaded/pom.xml | 5 ----- 3 files changed, 10 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/0b73e892/ratis-assembly/src/main/resources/NOTICE ---------------------------------------------------------------------- diff --git a/ratis-assembly/src/main/resources/NOTICE b/ratis-assembly/src/main/resources/NOTICE index 1a8ab55..d0fbf90 100644 --- a/ratis-assembly/src/main/resources/NOTICE +++ b/ratis-assembly/src/main/resources/NOTICE @@ -127,14 +127,6 @@ and decompression library written by Adrien Grand. It can be obtained at: * HOMEPAGE: * https://github.com/jpountz/lz4-java -This product optionally depends on 'lzma-java', a LZMA Java compression -and decompression library, which can be obtained at: - - * LICENSE: - * license/LICENSE.lzma-java.txt (Apache License 2.0) - * HOMEPAGE: - * https://github.com/jponge/lzma-java - This product contains a modified portion of 'jfastlz', a Java port of FastLZ compression and decompression library written by William Kinney. It can be obtained at: http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/0b73e892/ratis-examples/pom.xml ---------------------------------------------------------------------- diff --git a/ratis-examples/pom.xml b/ratis-examples/pom.xml index 877abbb..9a7183f 100644 --- a/ratis-examples/pom.xml +++ b/ratis-examples/pom.xml @@ -150,6 +150,16 @@ </mainClass> </transformer> </transformers> + <filters> + <filter> + <artifact>*:*</artifact> + <excludes> + <exlcude>META-INF/*.SF</exlcude> + <exclude>META-INF/*.DSA</exclude> + <exclude>META-INF/*.RSA</exclude> + </excludes> + </filter> + </filters> </configuration> </execution> </executions> http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/0b73e892/ratis-proto-shaded/pom.xml ---------------------------------------------------------------------- diff --git a/ratis-proto-shaded/pom.xml b/ratis-proto-shaded/pom.xml index eab30fe..de81586 100644 --- a/ratis-proto-shaded/pom.xml +++ b/ratis-proto-shaded/pom.xml @@ -266,11 +266,6 @@ <version>1.3.0</version> </dependency> <dependency> - <groupId>com.github.jponge</groupId> - <artifactId>lzma-java</artifactId> - <version>1.3</version> - </dependency> - <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcpkix-jdk15on</artifactId> <version>1.54</version>
