Repository: incubator-htrace Updated Branches: refs/heads/master 22c4fac69 -> fc7bf2383
HTRACE-7: htrace-core should shade its dependencies to avoid leaking them on to client CLASSPATH (cmccabe) Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/fc7bf238 Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/fc7bf238 Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/fc7bf238 Branch: refs/heads/master Commit: fc7bf238396056ba6d18053cd2e58686f951d68c Parents: 22c4fac Author: Colin Patrick Mccabe <[email protected]> Authored: Fri Dec 5 13:24:50 2014 -0800 Committer: Colin Patrick Mccabe <[email protected]> Committed: Fri Dec 5 14:12:51 2014 -0800 ---------------------------------------------------------------------- .gitignore | 2 ++ htrace-core/pom.xml | 24 ++++++++++++++++++++++++ pom.xml | 5 +++++ 3 files changed, 31 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/fc7bf238/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index b8acafe..a3b1b3e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ *.iml *.orig *~ +*.swp +dependency-reduced-pom.xml http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/fc7bf238/htrace-core/pom.xml ---------------------------------------------------------------------- diff --git a/htrace-core/pom.xml b/htrace-core/pom.xml index 783fb39..a8ea8f1 100644 --- a/htrace-core/pom.xml +++ b/htrace-core/pom.xml @@ -42,6 +42,30 @@ language governing permissions and limitations under the License. --> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <configuration> + <relocations> + <relocation> + <pattern>com.google.common</pattern> + <shadedPattern>org.apache.htrace.google.common</shadedPattern> + </relocation> + <relocation> + <pattern>org.mortbay</pattern> + <shadedPattern>org.apache.htrace.mortbay</shadedPattern> + </relocation> + </relocations> + </configuration> + <goals> + <goal>shade</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-gpg-plugin</artifactId> </plugin> <plugin> http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/fc7bf238/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0e5242a..067a7a9 100644 --- a/pom.xml +++ b/pom.xml @@ -174,6 +174,11 @@ language governing permissions and limitations under the License. --> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>2.1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-gpg-plugin</artifactId> </plugin> <plugin>
