Commit ab67a30
committed
Replace custom AndroidSignatureIgnore with standard @IgnoreJRERequirement
sqlite-jdbc's AndroidSignatureIgnore was a custom marker annotation
that only had meaning when their pom.xml configured the
animal-sniffer-maven-plugin with
<annotation>org.sqlite.util.AndroidSignatureIgnore</animation>. This
project does not configure animal-sniffer, so the vendored copy of
the annotation was inert.
Replaced with the standard @IgnoreJRERequirement from
org.codehaus.mojo:animal-sniffer-annotations 1.27 (latest stable).
The plugin recognises this annotation out of the box, so if signature
checking is ever enabled here it will work with zero further config.
Changes:
- pom.xml: add animal-sniffer-annotations 1.27, scope=provided
(retention=CLASS, not needed at runtime).
- Delete src/main/java/net/ladenthin/llama/AndroidSignatureIgnore.java
- OSInfo.java:
* Import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement.
* Replace the three @AndroidSignatureIgnore(explanation = "Should
not reach this code path") sites in isMusl, toRealPathOrEmpty,
and isAlpineLinux with @IgnoreJRERequirement plus a one-line //
comment preserving the explanation (the standard annotation has
no explanation field).
* Header lists this as a 4th documented deviation from upstream.
Verified:
- mvn clean compile: BUILD SUCCESS
- mvn test -Dtest=OSInfoTest,LlamaLoaderTest: 37/37 pass
- reuse lint: 137/137 files compliant with REUSE 3.3.1 parent f1d3f82 commit ab67a30
3 files changed
Lines changed: 22 additions & 26 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
87 | 87 | | |
88 | 88 | | |
89 | 89 | | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
90 | 99 | | |
91 | 100 | | |
92 | 101 | | |
| |||
Lines changed: 0 additions & 23 deletions
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
34 | 40 | | |
35 | 41 | | |
36 | 42 | | |
| |||
69 | 75 | | |
70 | 76 | | |
71 | 77 | | |
| 78 | + | |
72 | 79 | | |
73 | 80 | | |
74 | 81 | | |
| |||
183 | 190 | | |
184 | 191 | | |
185 | 192 | | |
186 | | - | |
| 193 | + | |
| 194 | + | |
187 | 195 | | |
188 | 196 | | |
189 | 197 | | |
| |||
197 | 205 | | |
198 | 206 | | |
199 | 207 | | |
200 | | - | |
| 208 | + | |
| 209 | + | |
201 | 210 | | |
202 | 211 | | |
203 | 212 | | |
| |||
206 | 215 | | |
207 | 216 | | |
208 | 217 | | |
209 | | - | |
| 218 | + | |
| 219 | + | |
210 | 220 | | |
211 | 221 | | |
212 | 222 | | |
| |||
0 commit comments