Skip to content

Commit

Permalink
sort lines and cleanup whitespace in hbase-assembly/hadoop-two-compat…
Browse files Browse the repository at this point in the history 
….xml
  • Loading branch information
@ndimiduk
ndimiduk committed Apr 1, 2020
1 parent 239d9b0 commit d294228
Showing 1 changed file with 70 additions and 68 deletions.
138 changes: 70 additions & 68 deletions hbase-assembly/src/main/assembly/hadoop-two-compat.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,51 +67,52 @@
<excludes>
<!-- Exclude J2EE libraries that get pulled in when building on JDK11 -->
<exclude>com.sun.activation:javax.activation</exclude>
<!-- The following artifacts are transitive dependencies of com.sun.xml.ws:jaxws-ri:pom
They are needed to be included in lib/jdk11 to be added to classpath during
Java 11 runtime hence excluding from main lib.
<!--
The following artifacts are transitive dependencies of com.sun.xml.ws:jaxws-ri:pom
They are needed to be included in lib/jdk11 to be added to classpath during
Java 11 runtime hence excluding from main lib.
-->
<exclude>com.sun.xml.ws:*</exclude>
<exclude>jakarta.annotation:jakarta.annotation-api</exclude>
<exclude>org.glassfish.jaxb:*</exclude>
<exclude>com.fasterxml.woodstox:woodstox-core</exclude>
<exclude>com.sun.istack:istack-commons-runtime</exclude>
<exclude>org.glassfish.gmbal:gmbal</exclude>
<exclude>org.glassfish.external:management-api</exclude>
<exclude>org.glassfish.pfl:*</exclude>
<exclude>org.jvnet.staxex:stax-ex</exclude>
<exclude>com.sun.xml.stream.buffer:streambuffer</exclude>
<exclude>org.jvnet.mimepull:mimepull</exclude>
<exclude>com.sun.xml.bind:jaxb-jxc</exclude>
<exclude>com.sun.xml.bind:jaxb-xjc</exclude>
<exclude>com.sun.xml.fastinfoset:FastInfoset</exclude>
<exclude>org.glassfish.ha:ha-api</exclude>
<exclude>com.sun.xml.messaging.saaj:saaj-impl</exclude>
<exclude>com.fasterxml.woodstox:woodstox-core</exclude>
<exclude>org.codehaus.woodstox:stax2-api</exclude>
<exclude>com.sun.xml.stream.buffer:streambuffer</exclude>
<exclude>com.sun.xml.ws:*</exclude>
<exclude>jakarta.activation:jakarta.activation-api</exclude>
<exclude>com.sun.xml.bind:jaxb-xjc</exclude>
<exclude>com.sun.xml.bind:jaxb-jxc</exclude>
<exclude>jakarta.annotation:jakarta.annotation-api</exclude>
<exclude>jakarta.jws:jakarta.jws-api</exclude>
<exclude>jakarta.mail:jakarta.mail-api</exclude>
<exclude>jakarta.persistence:jakarta.persistence-api</exclude>
<exclude>org.eclipse.persistence:*</exclude>
<exclude>jakarta.xml.ws:jakarta.xml.ws-api</exclude>
<exclude>jakarta.xml.bind:jakarta.xml.bind-api</exclude>
<exclude>jakarta.xml.soap:jakarta.xml.soap-api</exclude>
<exclude>jakarta.jws:jakarta.jws-api</exclude>
<!-- Exclude libraries that we put in their own dirs under lib/ -->
<exclude>org.jruby:jruby-complete</exclude>
<exclude>com.sun.jersey:*</exclude>
<exclude>jakarta.xml.ws:jakarta.xml.ws-api</exclude>
<exclude>org.codehaus.woodstox:stax2-api</exclude>
<exclude>org.eclipse.persistence:*</exclude>
<exclude>org.glassfish.external:management-api</exclude>
<exclude>org.glassfish.gmbal:gmbal</exclude>
<exclude>org.glassfish.ha:ha-api</exclude>
<exclude>org.glassfish.jaxb:*</exclude>
<exclude>org.glassfish.pfl:*</exclude>
<exclude>org.jvnet.mimepull:mimepull</exclude>
<exclude>org.jvnet.staxex:stax-ex</exclude>
<!-- Exclude libraries that we put in their own dirs under lib/ -->
<exclude>com.github.stephenc.findbugs:findbugs-annotations</exclude>
<exclude>com.sun.jersey.contribs:*</exclude>
<exclude>com.sun.jersey:*</exclude>
<exclude>commons-logging:commons-logging</exclude>
<exclude>jline:jline</exclude>
<exclude>org.apache.hbase:hbase-shaded-client</exclude>
<exclude>org.apache.hbase:hbase-shaded-client-byo-hadoop</exclude>
<exclude>org.apache.hbase:hbase-shaded-mapreduce</exclude>
<exclude>com.github.stephenc.findbugs:findbugs-annotations</exclude>
<exclude>commons-logging:commons-logging</exclude>
<exclude>log4j:log4j</exclude>
<exclude>org.apache.htrace:htrace-core4</exclude>
<exclude>org.apache.htrace:htrace-core</exclude>
<exclude>org.apache.yetus:audience-annotations</exclude>
<exclude>org.slf4j:slf4j-api</exclude>
<exclude>org.slf4j:slf4j-log4j12</exclude>
<exclude>log4j:log4j</exclude>
<exclude>org.apache.hbase:hbase-shaded-client-byo-hadoop</exclude>
<exclude>org.apache.hbase:hbase-shaded-client</exclude>
<exclude>org.apache.hbase:hbase-shaded-mapreduce</exclude>
<exclude>org.apache.htrace:htrace-core4</exclude>
<exclude>org.apache.htrace:htrace-core</exclude>
<exclude>org.apache.yetus:audience-annotations</exclude>
<exclude>org.jruby:jruby-complete</exclude>
<exclude>org.slf4j:slf4j-api</exclude>
<exclude>org.slf4j:slf4j-log4j12</exclude>
</excludes>
</dependencySet>
</dependencySets>
Expand Down Expand Up @@ -218,40 +219,41 @@
<include>jline:jline</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>lib/jdk11</outputDirectory>
<useTransitiveDependencies>true</useTransitiveDependencies>
<includes>
<include>com.sun.activation:javax.activation</include>
<!-- The following artifacts are transitive dependencies of com.sun.xml.ws:jaxws-ri:pom
They are needed to be included in lib/jdk11 to be added to classpath during
Java 11 runtime
-->
<include>com.sun.xml.ws:*</include>
<include>jakarta.annotation:jakarta.annotation-api</include>
<include>org.glassfish.jaxb:*</include>
<include>com.sun.istack:istack-commons-runtime</include>
<include>org.glassfish.gmbal:gmbal</include>
<include>org.glassfish.external:management-api</include>
<include>org.glassfish.pfl:*</include>
<include>org.jvnet.staxex:stax-ex</include>
<include>com.sun.xml.stream.buffer:streambuffer</include>
<include>org.jvnet.mimepull:mimepull</include>
<include>com.sun.xml.fastinfoset:FastInfoset</include>
<include>org.glassfish.ha:ha-api</include>
<include>com.sun.xml.messaging.saaj:saaj-impl</include>
<include>com.fasterxml.woodstox:woodstox-core</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>jakarta.activation:jakarta.activation-api</include>
<include>com.sun.xml.bind:jaxb-xjc</include>
<include>com.sun.xml.bind:jaxb-jxc</include>
<include>jakarta.mail:jakarta.mail-api</include>
<include>jakarta.persistence:jakarta.persistence-api</include>
<include>org.eclipse.persistence:*</include>
<include>jakarta.xml.ws:jakarta.xml.ws-api</include>
<include>jakarta.xml.bind:jakarta.xml.bind-api</include>
<include>jakarta.xml.soap:jakarta.xml.soap-api</include>
<include>jakarta.jws:jakarta.jws-api</include>
<dependencySet>
<outputDirectory>lib/jdk11</outputDirectory>
<useTransitiveDependencies>true</useTransitiveDependencies>
<includes>
<include>com.sun.activation:javax.activation</include>
<!--
The following artifacts are transitive dependencies of com.sun.xml.ws:jaxws-ri:pom
They are needed to be included in lib/jdk11 to be added to classpath during
Java 11 runtime
-->
<include>com.fasterxml.woodstox:woodstox-core</include>
<include>com.sun.istack:istack-commons-runtime</include>
<include>com.sun.xml.bind:jaxb-jxc</include>
<include>com.sun.xml.bind:jaxb-xjc</include>
<include>com.sun.xml.fastinfoset:FastInfoset</include>
<include>com.sun.xml.messaging.saaj:saaj-impl</include>
<include>com.sun.xml.stream.buffer:streambuffer</include>
<include>com.sun.xml.ws:*</include>
<include>jakarta.activation:jakarta.activation-api</include>
<include>jakarta.annotation:jakarta.annotation-api</include>
<include>jakarta.jws:jakarta.jws-api</include>
<include>jakarta.mail:jakarta.mail-api</include>
<include>jakarta.persistence:jakarta.persistence-api</include>
<include>jakarta.xml.bind:jakarta.xml.bind-api</include>
<include>jakarta.xml.soap:jakarta.xml.soap-api</include>
<include>jakarta.xml.ws:jakarta.xml.ws-api</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>org.eclipse.persistence:*</include>
<include>org.glassfish.external:management-api</include>
<include>org.glassfish.gmbal:gmbal</include>
<include>org.glassfish.ha:ha-api</include>
<include>org.glassfish.jaxb:*</include>
<include>org.glassfish.pfl:*</include>
<include>org.jvnet.mimepull:mimepull</include>
<include>org.jvnet.staxex:stax-ex</include>
</includes>
</dependencySet>
</dependencySets>
Expand Down

0 comments on commit d294228

Please sign in to comment.