File tree Expand file tree Collapse file tree 6 files changed +13
-14
lines changed
hbase-assembly/src/main/assembly Expand file tree Collapse file tree 6 files changed +13
-14
lines changed Original file line number Diff line number Diff line change 4444 <dependencySet >
4545 <excludes >
4646 <!-- Exclude J2EE libraries that get pulled in when building on JDK11 -->
47- <exclude >javax.annotation:javax.annotation-api</exclude >
4847 <exclude >com.sun.xml.ws:jaxws-ri</exclude >
4948 <!-- Exclude libraries that we put in their own dirs under lib/ -->
5049 <exclude >org.jruby:jruby-complete</exclude >
Original file line number Diff line number Diff line change 6565 <dependencySet >
6666 <excludes >
6767 <!-- Exclude J2EE libraries that get pulled in when building on JDK11 -->
68- <exclude >javax.annotation:javax.annotation-api</exclude >
6968 <exclude >com.sun.xml.ws:jaxws-ri</exclude >
7069 <!-- Exclude libraries that we put in their own dirs under lib/ -->
7170 <exclude >org.jruby:jruby-complete</exclude >
Original file line number Diff line number Diff line change 162162 </relocations >
163163 <artifactSet >
164164 <excludes >
165- <!-- exclude J2EE modules that come in for JDK11+ -->
165+ <!-- exclude J2EE modules that come in for JDK11+ or modules that come in for
166+ JDK8+ but need not be included -->
166167 <exclude >javax.annotation:javax.annotation-api</exclude >
167168 <!-- Exclude protobuf itself. We get a patched version from hbase-thirdparty.
168169 -->
Original file line number Diff line number Diff line change 5454 <configuration >
5555 <artifactSet >
5656 <excludes >
57- <!-- exclude J2EE modules that come in for JDK11+ -->
58- < exclude >javax.annotation:javax.annotation-api</ exclude >
59- <!-- exclude J2EE modules that come in for JDK11+ (since hadoop-3.2.0) -->
57+ <!-- exclude J2EE modules that come in for JDK11+ (since
58+ hadoop-3.2.0) or modules that come in for JDK8+ but
59+ need not be included -->
6060 <exclude >javax.activation:javax.activation-api</exclude >
6161 <!--
6262 Tell the shade plugin that in this case we want to include hadoop
Original file line number Diff line number Diff line change 132132 <shadeTestJar >false</shadeTestJar >
133133 <artifactSet >
134134 <excludes >
135- <!-- exclude J2EE modules that come in for JDK11+ -->
136- < exclude >javax.annotation:javax.annotation-api</ exclude >
137- <!-- exclude J2EE modules that come in for JDK11+ (since hadoop-3.2.0) -->
135+ <!-- exclude J2EE modules that come in for JDK11+ (since
136+ hadoop-3.2.0) or modules that come in for JDK8+ but
137+ need not be included -->
138138 <exclude >javax.activation:javax.activation-api</exclude >
139139 <!-- default to excluding Hadoop, have module that want
140140 to include it redefine the exclude list -->
Original file line number Diff line number Diff line change 18711871 <artifactId >javax.activation</artifactId >
18721872 <version >1.2.0</version >
18731873 </dependency >
1874+ <dependency >
1875+ <groupId >javax.annotation</groupId >
1876+ <artifactId >javax.annotation-api</artifactId >
1877+ <version >1.2</version >
1878+ </dependency >
18741879 <dependency >
18751880 <groupId >org.eclipse.jetty</groupId >
18761881 <artifactId >jetty-server</artifactId >
21942199 </activation >
21952200 <dependencyManagement >
21962201 <dependencies >
2197- <dependency >
2198- <groupId >javax.annotation</groupId >
2199- <artifactId >javax.annotation-api</artifactId >
2200- <version >1.3.2</version >
2201- </dependency >
22022202 <dependency >
22032203 <groupId >com.sun.xml.ws</groupId >
22042204 <artifactId >jaxws-ri</artifactId >
You can’t perform that action at this time.
0 commit comments