honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12601 from rmuir/another_shading_test 

Test that shaded jar contains only shaded classes
This commit is contained in:
Robert Muir 2015-08-03 10:08:43 -04:00
parent 26d51c299e e1886a9b12
commit bc8893a971
2 changed files with 43 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dev-tools/src/main/resources/ant/integration-tests.xml
View File

@ -286,4 +286,26 @@
</java>
</target>
<target name="check-shaded-jar-packages">
<!-- we unzip the jar, vs zipfileset, zipfileset toString is useless -->
<delete dir="${integ.temp}/unzipped"/>
<mkdir dir="${integ.temp}/unzipped"/>
<unzip src="${project.build.directory}/${project.artifactId}-${project.version}.jar"
dest="${integ.temp}/unzipped"/>
<local name="unshaded.classes"/>
<fileset id="unshaded.classes"
dir="${integ.temp}/unzipped"
includes="**/*.class"
excludes="org/elasticsearch/**,org/apache/lucene/**"/>
<fail message="shaded jar contains packages outside of org.elasticsearch: ${toString:unshaded.classes}">
<condition>
<not>
<resourcecount count="0">
<fileset refid="unshaded.classes"/>
</resourcecount>
</not>
</condition>
</fail>
</target>
</project>

39
distribution/shaded/pom.xml
View File

@ -51,6 +51,7 @@
<configuration>
<target>
<ant antfile="${elasticsearch.integ.antfile}" target="check-for-jar-hell"/>
<ant antfile="${elasticsearch.integ.antfile}" target="check-shaded-jar-packages"/>
</target>
</configuration>
</execution>
@ -74,24 +75,10 @@
<createDependencyReducedPom>true</createDependencyReducedPom>
<dependencyReducedPomLocation>${build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
<artifactSet>
<includes>
<include>org.elasticsearch:elasticsearch</include>
<include>com.google.guava:guava</include>
<include>com.carrotsearch:hppc</include>
<include>com.fasterxml.jackson.core:jackson-core</include>
<include>com.fasterxml.jackson.dataformat:jackson-dataformat-smile</include>
<include>com.fasterxml.jackson.dataformat:jackson-dataformat-yaml</include>
<include>com.fasterxml.jackson.dataformat:jackson-dataformat-cbor</include>
<include>joda-time:joda-time</include>
<include>org.joda:joda-convert</include>
<include>io.netty:netty</include>
<include>com.ning:compress-lzf</include>
<include>com.github.spullara.mustache.java:compiler</include>
<include>com.tdunning:t-digest</include>
<include>org.apache.commons:commons-lang3</include>
<include>commons-cli:commons-cli</include>
<include>com.twitter:jsr166e</include>
</includes>
<excludes>
<exclude>org.apache.lucene:*</exclude>
<exclude>com.spatial4j:*</exclude>
</excludes>
</artifactSet>
<transformers>
<!-- copy over MANIFEST.MF from unshaded jar, but mark jar as shaded too -->
@ -106,10 +93,22 @@
<pattern>com.google.common</pattern>
<shadedPattern>org.elasticsearch.common</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.thirdparty</pattern>
<shadedPattern>org.elasticsearch.common.thirdparty</shadedPattern>
</relocation>
<relocation>
<pattern>com.carrotsearch.hppc</pattern>
<shadedPattern>org.elasticsearch.common.hppc</shadedPattern>
</relocation>
<relocation>
<pattern>org.HdrHistogram</pattern>
<shadedPattern>org.elasticsearch.common.HdrHistogram</shadedPattern>
</relocation>
<relocation>
<pattern>org.yaml</pattern>
<shadedPattern>org.elasticsearch.common.yaml</shadedPattern>
</relocation>
<relocation>
<pattern>com.twitter.jsr166e</pattern>
<shadedPattern>org.elasticsearch.common.util.concurrent.jsr166e</shadedPattern>
@ -122,6 +121,10 @@
<pattern>org.joda.time</pattern>
<shadedPattern>org.elasticsearch.common.joda.time</shadedPattern>
</relocation>
<relocation>
<pattern>org.joda.convert</pattern>
<shadedPattern>org.elasticsearch.common.joda.convert</shadedPattern>
</relocation>
<relocation>
<pattern>org.jboss.netty</pattern>
<shadedPattern>org.elasticsearch.common.netty</shadedPattern>