Skip to content

Commit 155b018

Browse files
Apache9Apache9
committed
HBASE-29085 Addendum downgrade spotless to 2.30.0 for java8 compatibility
1 parent 4fb73ea commit 155b018

File tree

13 files changed

+397
-427
lines changed

13 files changed

+397
-427
lines changed

‎hbase-noop-htrace/pom.xml

+7-9
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,8 @@
2929
</parent>
3030
<artifactId>hbase-noop-htrace</artifactId>
3131
<name>Apache HBase Drop-in noop HTrace replacement</name>
32-
<description>
33-
Implements the HTrace APIs with noops and nonsense aimed at a) removing CVE flagged transitive
34-
dependencies and b) favoring the JIT optimizing it away.
35-
</description>
32+
<description>Implements the HTrace APIs with noops and nonsense aimed at a) removing CVE flagged transitive
33+
dependencies and b) favoring the JIT optimizing it away.</description>
3634
<properties>
3735
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
3836
<!-- This library is meant to work with whatever HBase and Hadoop combos we still list
@@ -87,6 +85,11 @@
8785
<groupId>org.apache.maven.plugins</groupId>
8886
<artifactId>maven-checkstyle-plugin</artifactId>
8987
<version>${maven.checkstyle.version}</version>
88+
<configuration>
89+
<configLocation>hbase/checkstyle.xml</configLocation>
90+
<suppressionsLocation>hbase/checkstyle-suppressions.xml</suppressionsLocation>
91+
<includeTestSourceDirectory>true</includeTestSourceDirectory>
92+
</configuration>
9093
<dependencies>
9194
<dependency>
9295
<groupId>org.apache.hbase</groupId>
@@ -99,11 +102,6 @@
99102
<version>${checkstyle.version}</version>
100103
</dependency>
101104
</dependencies>
102-
<configuration>
103-
<configLocation>hbase/checkstyle.xml</configLocation>
104-
<suppressionsLocation>hbase/checkstyle-suppressions.xml</suppressionsLocation>
105-
<includeTestSourceDirectory>true</includeTestSourceDirectory>
106-
</configuration>
107105
</plugin>
108106
<plugin>
109107
<groupId>org.apache.maven.plugins</groupId>

‎hbase-shaded-gson/pom.xml

+10-13
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,14 @@
3737
</parent>
3838
<artifactId>hbase-shaded-gson</artifactId>
3939
<name>Apache HBase Relocated (Shaded) GSON Libs</name>
40-
<description>
41-
Pulls down GSON, relocates it and makes a far jar.
42-
</description>
40+
<description>Pulls down GSON, relocates it and makes a far jar.</description>
41+
<dependencies>
42+
<dependency>
43+
<groupId>com.google.code.gson</groupId>
44+
<artifactId>gson</artifactId>
45+
<version>${gson.version}</version>
46+
</dependency>
47+
</dependencies>
4348
<build>
4449
<plugins>
4550
<plugin>
@@ -60,10 +65,10 @@
6065
<artifactId>maven-shade-plugin</artifactId>
6166
<executions>
6267
<execution>
63-
<phase>package</phase>
6468
<goals>
6569
<goal>shade</goal>
6670
</goals>
71+
<phase>package</phase>
6772
<configuration>
6873
<shadeSourcesContent>true</shadeSourcesContent>
6974
<createSourcesJar>true</createSourcesJar>
@@ -94,8 +99,7 @@
9499
</excludes>
95100
</artifactSet>
96101
<transformers>
97-
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer">
98-
</transformer>
102+
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
99103
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
100104
<addHeader>false</addHeader>
101105
</transformer>
@@ -106,11 +110,4 @@
106110
</plugin>
107111
</plugins>
108112
</build>
109-
<dependencies>
110-
<dependency>
111-
<groupId>com.google.code.gson</groupId>
112-
<artifactId>gson</artifactId>
113-
<version>${gson.version}</version>
114-
</dependency>
115-
</dependencies>
116113
</project>

‎hbase-shaded-jackson-jaxrs-json-provider/pom.xml

+76-79
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3-
<!--
3+
<!--
44
/**
55
* Licensed to the Apache Software Foundation (ASF) under one
66
* or more contributor license agreements. See the NOTICE file
@@ -28,86 +28,83 @@
2828
https://issues.apache.org/jira/browse/HBASE-6795.
2929
3030
-->
31-
<modelVersion>4.0.0</modelVersion>
32-
<parent>
33-
<groupId>org.apache.hbase.thirdparty</groupId>
34-
<artifactId>hbase-thirdparty</artifactId>
35-
<version>${revision}</version>
36-
<relativePath>..</relativePath>
37-
</parent>
38-
<artifactId>hbase-shaded-jackson-jaxrs-json-provider</artifactId>
39-
<name>Apache HBase Relocated (Shaded) jackson-jaxrs-json-provider</name>
40-
<description>
41-
Pulls down jackson-jaxrs-json-provider, relocates it, and rewrites its usage of javax.ws.rs
31+
<modelVersion>4.0.0</modelVersion>
32+
<parent>
33+
<groupId>org.apache.hbase.thirdparty</groupId>
34+
<artifactId>hbase-thirdparty</artifactId>
35+
<version>${revision}</version>
36+
<relativePath>..</relativePath>
37+
</parent>
38+
<artifactId>hbase-shaded-jackson-jaxrs-json-provider</artifactId>
39+
<name>Apache HBase Relocated (Shaded) jackson-jaxrs-json-provider</name>
40+
<description>Pulls down jackson-jaxrs-json-provider, relocates it, and rewrites its usage of javax.ws.rs
4241
classes to make the relocated versions provided by hbase-shaded-jersey. Does NOT
4342
include/relocate its entire dependency graph, just performs this isolated transform.
4443

4544
This is a separate module because jackson-jaxrs-json-provider is not used universally. At
46-
this time, the dependency is required only by hbase-rest.
47-
</description>
48-
<build>
49-
<plugins>
50-
<plugin>
51-
<artifactId>maven-clean-plugin</artifactId>
52-
<configuration>
53-
<filesets>
54-
<fileset>
55-
<directory>${basedir}</directory>
56-
<includes>
57-
<include>dependency-reduced-pom.xml</include>
58-
</includes>
59-
</fileset>
60-
</filesets>
61-
</configuration>
62-
</plugin>
63-
<plugin>
64-
<groupId>org.apache.maven.plugins</groupId>
65-
<artifactId>maven-shade-plugin</artifactId>
66-
<executions>
67-
<execution>
68-
<phase>package</phase>
69-
<goals>
70-
<goal>shade</goal>
71-
</goals>
72-
<configuration>
73-
<shadeSourcesContent>true</shadeSourcesContent>
74-
<createSourcesJar>true</createSourcesJar>
75-
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
76-
<relocations>
77-
<relocation>
78-
<pattern>javax.ws.rs</pattern>
79-
<shadedPattern>${rename.offset}.javax.ws.rs</shadedPattern>
80-
</relocation>
81-
<relocation>
82-
<pattern>com.fasterxml.jackson.jaxrs</pattern>
83-
<shadedPattern>${rename.offset}.com.fasterxml.jackson.jaxrs</shadedPattern>
84-
</relocation>
85-
</relocations>
86-
<artifactSet>
87-
<includes>
88-
<include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base</include>
89-
<include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider</include>
90-
</includes>
91-
</artifactSet>
92-
<transformers>
93-
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer">
94-
</transformer>
95-
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
96-
<addHeader>false</addHeader>
97-
</transformer>
98-
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
99-
</transformers>
100-
</configuration>
101-
</execution>
102-
</executions>
103-
</plugin>
104-
</plugins>
105-
</build>
106-
<dependencies>
107-
<dependency>
108-
<groupId>com.fasterxml.jackson.jaxrs</groupId>
109-
<artifactId>jackson-jaxrs-json-provider</artifactId>
110-
<version>${jackson-jaxrs-json-provider.version}</version>
111-
</dependency>
112-
</dependencies>
45+
this time, the dependency is required only by hbase-rest.</description>
46+
<dependencies>
47+
<dependency>
48+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
49+
<artifactId>jackson-jaxrs-json-provider</artifactId>
50+
<version>${jackson-jaxrs-json-provider.version}</version>
51+
</dependency>
52+
</dependencies>
53+
<build>
54+
<plugins>
55+
<plugin>
56+
<artifactId>maven-clean-plugin</artifactId>
57+
<configuration>
58+
<filesets>
59+
<fileset>
60+
<directory>${basedir}</directory>
61+
<includes>
62+
<include>dependency-reduced-pom.xml</include>
63+
</includes>
64+
</fileset>
65+
</filesets>
66+
</configuration>
67+
</plugin>
68+
<plugin>
69+
<groupId>org.apache.maven.plugins</groupId>
70+
<artifactId>maven-shade-plugin</artifactId>
71+
<executions>
72+
<execution>
73+
<goals>
74+
<goal>shade</goal>
75+
</goals>
76+
<phase>package</phase>
77+
<configuration>
78+
<shadeSourcesContent>true</shadeSourcesContent>
79+
<createSourcesJar>true</createSourcesJar>
80+
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
81+
<relocations>
82+
<relocation>
83+
<pattern>javax.ws.rs</pattern>
84+
<shadedPattern>${rename.offset}.javax.ws.rs</shadedPattern>
85+
</relocation>
86+
<relocation>
87+
<pattern>com.fasterxml.jackson.jaxrs</pattern>
88+
<shadedPattern>${rename.offset}.com.fasterxml.jackson.jaxrs</shadedPattern>
89+
</relocation>
90+
</relocations>
91+
<artifactSet>
92+
<includes>
93+
<include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base</include>
94+
<include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider</include>
95+
</includes>
96+
</artifactSet>
97+
<transformers>
98+
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
99+
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
100+
<addHeader>false</addHeader>
101+
</transformer>
102+
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
103+
</transformers>
104+
</configuration>
105+
</execution>
106+
</executions>
107+
</plugin>
108+
</plugins>
109+
</build>
113110
</project>

0 commit comments

Comments
 (0)