You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2017/06/27 03:59:45 UTC
[1/4] hbase-thirdparty git commit: Add DISCLAIMER
Repository: hbase-thirdparty
Updated Branches:
refs/heads/master baa68db71 -> d91f4f0e9
Add DISCLAIMER
Project: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/commit/5c72f4bf
Tree: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/tree/5c72f4bf
Diff: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/diff/5c72f4bf
Branch: refs/heads/master
Commit: 5c72f4bfdece59bdb31774c5aa51ae3b9338f2f1
Parents: baa68db
Author: Michael Stack <st...@apache.org>
Authored: Mon Jun 26 15:52:33 2017 -0700
Committer: Michael Stack <st...@apache.org>
Committed: Mon Jun 26 15:52:33 2017 -0700
----------------------------------------------------------------------
README.txt | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/blob/5c72f4bf/README.txt
----------------------------------------------------------------------
diff --git a/README.txt b/README.txt
index 9605a5d..09861c1 100644
--- a/README.txt
+++ b/README.txt
@@ -1,5 +1,8 @@
This project packages relocated third-party libraries used by Apache HBase.
+DISCLAIMER: This is an HBase internal project. Included libs and/or their
+versions change at the dictate of hbase without regard to others concerns.
+
To build, just run:
$ mvn install
[4/4] hbase-thirdparty git commit: Trying to rename the netty .so
Posted by st...@apache.org.
Trying to rename the netty .so
Project: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/commit/d91f4f0e
Tree: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/tree/d91f4f0e
Diff: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/diff/d91f4f0e
Branch: refs/heads/master
Commit: d91f4f0e94b3c1c727b2b56cdf3c689f8bd29a07
Parents: c3d0cf9
Author: Michael Stack <st...@apache.org>
Authored: Mon Jun 26 20:59:38 2017 -0700
Committer: Michael Stack <st...@apache.org>
Committed: Mon Jun 26 20:59:38 2017 -0700
----------------------------------------------------------------------
hbase-shaded-thirdparty/pom.xml | 140 ++++++++++++++++++++++-------------
1 file changed, 87 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/blob/d91f4f0e/hbase-shaded-thirdparty/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shaded-thirdparty/pom.xml b/hbase-shaded-thirdparty/pom.xml
index daa3c73..d24b49b 100644
--- a/hbase-shaded-thirdparty/pom.xml
+++ b/hbase-shaded-thirdparty/pom.xml
@@ -41,64 +41,98 @@
Pulls down libs, relocates them and then makes a fat new jar with them all in it.
</description>
<build>
- <plugins>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}</directory>
- <includes>
- <include>dependency-reduced-pom.xml</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <relocations>
- <relocation>
- <pattern>io.netty</pattern>
- <shadedPattern>${rename.offset}.io.netty</shadedPattern>
- <excludes>
- <!--Getting at native code; can't relocate this w/o changing c-source
+ <plugins>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>dependency-reduced-pom.xml</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <relocations>
+ <relocation>
+ <pattern>libnetty-transport-native-epoll.so</pattern>
+ <shadedPattern>lib${rename.offset}-netty-transport-native-epoll.so</shadedPattern>
+ <excludes>
+ <!--Getting at native code; can't relocate this w/o changing c-source
-->
- <exclude>
+ <exclude>
io.netty.channel.unix.*
</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>com.google</pattern>
- <shadedPattern>${rename.offset}.com.google</shadedPattern>
- </relocation>
- </relocations>
- <artifactSet>
- <excludes>
- <!--Exclude protobuf itself. We get a patched version in adjacent module.
+ </excludes>
+ </relocation>
+ <relocation>
+ <pattern>io.netty</pattern>
+ <shadedPattern>${rename.offset}.io.netty</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.google</pattern>
+ <shadedPattern>${rename.offset}.com.google</shadedPattern>
+ </relocation>
+ </relocations>
+ <artifactSet>
+ <excludes>
+ <!--Exclude protobuf itself. We get a patched version in adjacent module.
Exclude other dependencies of guava, netty, etc.
-->
- <exclude>com.google.protobuf:protobuf-java</exclude>
- <exclude>com.google.code.findbugs:jsr305</exclude>
- <exclude>com.google.errorprone:error_prone_annotations</exclude>
- <exclude>com.google.j2objc:j2objc-annotations</exclude>
- <exclude>org.codehaus.mojo:animal-sniffer-annotations</exclude>
- <exclude>org.codehaus.mojo:animal-sniffer-annotations</exclude>
- </excludes>
- </artifactSet>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <exclude>com.google.protobuf:protobuf-java</exclude>
+ <exclude>com.google.code.findbugs:jsr305</exclude>
+ <exclude>com.google.errorprone:error_prone_annotations</exclude>
+ <exclude>com.google.j2objc:j2objc-annotations</exclude>
+ <exclude>org.codehaus.mojo:animal-sniffer-annotations</exclude>
+ <exclude>org.codehaus.mojo:animal-sniffer-annotations</exclude>
+ </excludes>
+ </artifactSet>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <!--This trick from
+ https://stackoverflow.com/questions/33825743/rename-files-inside-a-jar-using-some-maven-plugin
+ -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>package</phase>
+ <configuration>
+ <target>
+ <echo message="unjar"/>
+ <unzip src="${project.build.directory}/${artifactId}-${version}.jar"
+ dest="${project.build.directory}/unpacked/"/>
+ <echo message="Rename netty .so in META-INF"/>
+ <move file="${project.build.directory}/unpacked/META-INF/native/libnetty-transport-native-epoll.so"
+ tofile="${project.build.directory}/unpacked/META-INF/native/lib${rename.offset}netty-transport-native-epoll.so" />
+ <echo message="Redo jar"/>
+ <jar destfile="${project.build.directory}/${artifactId}-${version}.jar"
+ basedir="${project.build.directory}/unpacked"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<dependencies>
[2/4] hbase-thirdparty git commit: Exclude
io/netty/channel/unix/LimitsStaticallyReferencedJniMethods -- needed by
native code
Posted by st...@apache.org.
Exclude io/netty/channel/unix/LimitsStaticallyReferencedJniMethods -- needed by native code
Project: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/commit/535b133a
Tree: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/tree/535b133a
Diff: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/diff/535b133a
Branch: refs/heads/master
Commit: 535b133abd1aff174140d3aaf50d34ed33e564aa
Parents: 5c72f4b
Author: Michael Stack <st...@apache.org>
Authored: Mon Jun 26 16:41:14 2017 -0700
Committer: Michael Stack <st...@apache.org>
Committed: Mon Jun 26 16:41:14 2017 -0700
----------------------------------------------------------------------
README.txt | 5 +++--
hbase-shaded-thirdparty/pom.xml | 8 +++++++-
2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/blob/535b133a/README.txt
----------------------------------------------------------------------
diff --git a/README.txt b/README.txt
index 09861c1..7675669 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,8 @@
This project packages relocated third-party libraries used by Apache HBase.
-DISCLAIMER: This is an HBase internal project. Included libs and/or their
-versions change at the dictate of hbase without regard to others concerns.
+DISCLAIMER: This project is for Apache HBase internal use. Included libs
+and/or their versions are subject to change at the dictate of hbase without
+regard to the concern of others!
To build, just run:
http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/blob/535b133a/hbase-shaded-thirdparty/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shaded-thirdparty/pom.xml b/hbase-shaded-thirdparty/pom.xml
index 82a0820..c7ce515 100644
--- a/hbase-shaded-thirdparty/pom.xml
+++ b/hbase-shaded-thirdparty/pom.xml
@@ -65,11 +65,17 @@
<goal>shade</goal>
</goals>
<configuration>
- <shadeSourcesContent>true</shadeSourcesContent>
<relocations>
<relocation>
<pattern>io.netty</pattern>
<shadedPattern>${rename.offset}.io.netty</shadedPattern>
+ <excludes>
+ <!--Getting at native code; can't relocate this w/o changing c-source
+ -->
+ <exclude>
+ io.netty.channel.unix.LimitsStaticallyReferencedJniMethods
+ </exclude>
+ </excludes>
</relocation>
<relocation>
<pattern>com.google</pattern>
[3/4] hbase-thirdparty git commit: Try exclude all files in unix
package
Posted by st...@apache.org.
Try exclude all files in unix package
Project: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/commit/c3d0cf96
Tree: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/tree/c3d0cf96
Diff: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/diff/c3d0cf96
Branch: refs/heads/master
Commit: c3d0cf96bb9a484ef90ec1b2151e4c77d0a9f6c6
Parents: 535b133
Author: Michael Stack <st...@apache.org>
Authored: Mon Jun 26 17:20:40 2017 -0700
Committer: Michael Stack <st...@apache.org>
Committed: Mon Jun 26 17:20:40 2017 -0700
----------------------------------------------------------------------
hbase-shaded-thirdparty/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/blob/c3d0cf96/hbase-shaded-thirdparty/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shaded-thirdparty/pom.xml b/hbase-shaded-thirdparty/pom.xml
index c7ce515..daa3c73 100644
--- a/hbase-shaded-thirdparty/pom.xml
+++ b/hbase-shaded-thirdparty/pom.xml
@@ -73,7 +73,7 @@
<!--Getting at native code; can't relocate this w/o changing c-source
-->
<exclude>
- io.netty.channel.unix.LimitsStaticallyReferencedJniMethods
+ io.netty.channel.unix.*
</exclude>
</excludes>
</relocation>