|
52 | 52 | <slf4j-log4j12.version>1.7.25</slf4j-log4j12.version>
|
53 | 53 | <guava.version>19.0</guava.version>
|
54 | 54 | <netty.version>4.1.77.Final</netty.version>
|
| 55 | + <netty-tcnative.artifact>netty-tcnative</netty-tcnative.artifact> |
55 | 56 | <netty-tcnative.version>2.0.52.Final</netty-tcnative.version>
|
56 | 57 | <metrics.version>3.2.2</metrics.version>
|
57 | 58 | <snappy.version>1.1.2.6</snappy.version>
|
|
350 | 351 |
|
351 | 352 | <dependency>
|
352 | 353 | <groupId>io.netty</groupId>
|
353 |
| - <artifactId>netty-tcnative</artifactId> |
| 354 | + <artifactId>${netty-tcnative.artifact}</artifactId> |
354 | 355 | <version>${netty-tcnative.version}</version>
|
355 | 356 | <classifier>${os.detected.classifier}</classifier>
|
356 | 357 | </dependency>
|
@@ -717,7 +718,7 @@ limitations under the License.
|
717 | 718 | <plugin>
|
718 | 719 | <groupId>org.codehaus.mojo</groupId>
|
719 | 720 | <artifactId>animal-sniffer-maven-plugin</artifactId>
|
720 |
| - <version>1.15</version> |
| 721 | + <version>1.16</version> |
721 | 722 | <executions>
|
722 | 723 | <execution>
|
723 | 724 | <id>check-jdk6</id>
|
@@ -1125,6 +1126,24 @@ limitations under the License.
|
1125 | 1126 | <test.osgi.skip>true</test.osgi.skip>
|
1126 | 1127 | </properties>
|
1127 | 1128 | </profile>
|
| 1129 | + |
| 1130 | + <profile> |
| 1131 | + <id>apple-silicon-dev</id> |
| 1132 | + <activation> |
| 1133 | + <os> |
| 1134 | + <name>mac os x</name> |
| 1135 | + <family>mac</family> |
| 1136 | + <arch>aarch64</arch> |
| 1137 | + </os> |
| 1138 | + </activation> |
| 1139 | + <properties> |
| 1140 | + <!-- https://netty.io/wiki/forked-tomcat-native.html netty on apple-silicon requires the boringssl variant of tc-native --> |
| 1141 | + <netty-tcnative.artifact>netty-tcnative-boringssl-static</netty-tcnative.artifact> |
| 1142 | + <!-- https://github.com/jnr/jffi/pull/116 apple-silicon requires signed jffi binaries, added in 1.3.8 (jnr-ffi 2.2.10+) --> |
| 1143 | + <jnr-ffi.version>2.2.10</jnr-ffi.version> |
| 1144 | + </properties> |
| 1145 | + |
| 1146 | + </profile> |
1128 | 1147 | </profiles>
|
1129 | 1148 |
|
1130 | 1149 | <distributionManagement>
|
|
0 commit comments