|
838 | 838 | modules and cause trouble if we only rely on transitive dependencies. |
839 | 839 | --> |
840 | 840 | <netty3.version>3.10.6.Final</netty3.version> |
841 | | - <netty4.version>4.1.112.Final</netty4.version> |
842 | 841 | <!-- end HBASE-15925 default hadoop compatibility values --> |
843 | 842 | <audience-annotations.version>0.15.0</audience-annotations.version> |
844 | 843 | <javadoc.audience-annotations.version>0.15.0</javadoc.audience-annotations.version> |
|
854 | 853 | <httpclient.version>4.5.13</httpclient.version> |
855 | 854 | <httpcore.version>4.4.13</httpcore.version> |
856 | 855 | <metrics-core.version>3.2.6</metrics-core.version> |
857 | | - <!-- |
858 | | - Note that the version of jackson-[annotations,core,databind] must be kept in sync with the |
859 | | - version of jackson-jaxrs-json-provider shipped in hbase-thirdparty. |
860 | | - --> |
861 | | - <jackson.version>2.17.2</jackson.version> |
862 | | - <jackson.databind.version>2.17.2</jackson.databind.version> |
863 | 856 | <jaxb-api.version>2.3.1</jaxb-api.version> |
864 | | - <servlet.api.version>3.1.0</servlet.api.version> |
865 | 857 | <wx.rs.api.version>2.1.1</wx.rs.api.version> |
866 | 858 | <tomcat.jasper.version>9.0.93</tomcat.jasper.version> |
867 | 859 | <jruby.version>9.4.8.0</jruby.version> |
|
899 | 891 | --> |
900 | 892 | <checkstyle.version>8.29</checkstyle.version> |
901 | 893 | <exec.maven.version>3.1.0</exec.maven.version> |
902 | | - <error-prone.version>2.28.0</error-prone.version> |
903 | 894 | <jamon.plugin.version>2.4.2</jamon.plugin.version> |
904 | 895 | <lifecycle.mapping.version>1.0.0</lifecycle.mapping.version> |
905 | 896 | <maven.antrun.version>1.8</maven.antrun.version> |
|
925 | 916 | <lz4.version>1.8.0</lz4.version> |
926 | 917 | <snappy.version>1.1.10.4</snappy.version> |
927 | 918 | <zstd-jni.version>1.5.5-2</zstd-jni.version> |
928 | | - <!-- |
929 | | - Note that the version of protobuf shipped in hbase-thirdparty must match the version used |
930 | | - in hbase-protocol-shaded and hbase-examples. The version of jackson-[annotations,core, |
931 | | - databind] must be kept in sync with the version of jackson-jaxrs-json-provider shipped in |
932 | | - hbase-thirdparty. |
| 919 | + <hbase-thirdparty.version>4.1.10-SNAPSHOT</hbase-thirdparty.version> |
| 920 | + <!-- Version of protobuf that hbase uses internally (we shade our pb). Must be kept in sync |
| 921 | + with the version of protobuf shipped in hbase-thirdparty. We need this as the property is |
| 922 | + needed by protobuf-maven-plugin to compile protoc |
933 | 923 | --> |
934 | | - <hbase-thirdparty.version>4.1.9</hbase-thirdparty.version> |
| 924 | + <internal.protobuf.version>4.28.2</internal.protobuf.version> |
935 | 925 | <!-- Coverage properties --> |
936 | 926 | <jacoco.version>0.8.8</jacoco.version> |
937 | 927 | <jacocoArgLine/> |
|
1528 | 1518 | <artifactId>joni</artifactId> |
1529 | 1519 | <version>${joni.version}</version> |
1530 | 1520 | </dependency> |
1531 | | - <dependency> |
1532 | | - <groupId>com.fasterxml.jackson.core</groupId> |
1533 | | - <artifactId>jackson-annotations</artifactId> |
1534 | | - <version>${jackson.version}</version> |
1535 | | - </dependency> |
1536 | | - <dependency> |
1537 | | - <groupId>com.fasterxml.jackson.core</groupId> |
1538 | | - <artifactId>jackson-core</artifactId> |
1539 | | - <version>${jackson.version}</version> |
1540 | | - </dependency> |
1541 | | - <dependency> |
1542 | | - <groupId>com.fasterxml.jackson.core</groupId> |
1543 | | - <artifactId>jackson-databind</artifactId> |
1544 | | - <version>${jackson.databind.version}</version> |
1545 | | - </dependency> |
1546 | 1521 | <dependency> |
1547 | 1522 | <groupId>org.jamon</groupId> |
1548 | 1523 | <artifactId>jamon-runtime</artifactId> |
1549 | 1524 | <version>${jamon-runtime.version}</version> |
1550 | 1525 | </dependency> |
1551 | 1526 | <!-- REST dependencies --> |
1552 | | - <dependency> |
1553 | | - <groupId>javax.servlet</groupId> |
1554 | | - <artifactId>javax.servlet-api</artifactId> |
1555 | | - <version>${servlet.api.version}</version> |
1556 | | - </dependency> |
1557 | 1527 | <dependency> |
1558 | 1528 | <groupId>javax.ws.rs</groupId> |
1559 | 1529 | <artifactId>javax.ws.rs-api</artifactId> |
|
1767 | 1737 | <artifactId>zstd-jni</artifactId> |
1768 | 1738 | <version>${zstd-jni.version}</version> |
1769 | 1739 | </dependency> |
| 1740 | + <!-- hbase-thirdparty bom --> |
| 1741 | + <dependency> |
| 1742 | + <groupId>org.apache.hbase.thirdparty</groupId> |
| 1743 | + <artifactId>hbase-thirdparty-bom</artifactId> |
| 1744 | + <version>${hbase-thirdparty.version}</version> |
| 1745 | + <type>pom</type> |
| 1746 | + <scope>import</scope> |
| 1747 | + </dependency> |
1770 | 1748 | <!-- shaded thirdparty --> |
1771 | 1749 | <dependency> |
1772 | 1750 | <groupId>org.apache.hbase.thirdparty</groupId> |
|
1838 | 1816 | <artifactId>netty</artifactId> |
1839 | 1817 | <version>${netty3.version}</version> |
1840 | 1818 | </dependency> |
1841 | | - <dependency> |
1842 | | - <groupId>io.netty</groupId> |
1843 | | - <artifactId>netty-bom</artifactId> |
1844 | | - <version>${netty4.version}</version> |
1845 | | - <type>pom</type> |
1846 | | - <scope>import</scope> |
1847 | | - </dependency> |
1848 | 1819 | </dependencies> |
1849 | 1820 | </dependencyManagement> |
1850 | 1821 | <dependencies> |
|
0 commit comments