Merge commit '142f5c8e5c889ee5098c05ba2fde20b52467c1df' into feature/platform-caps

2025-07-05 04:26:42 +00:00 · 2014-06-27 16:03:29 -07:00
parent c9e60f1f60 142f5c8e5c
commit 8f1943fd84
69 changed files with 5209 additions and 359 deletions
--- a/src/main/build/import-control.xml
+++ b/src/main/build/import-control.xml
@ -9,6 +9,7 @@
  <allow pkg="org.mockito"/>
  <allow pkg="com.sk89q"/>
  <allow pkg="com.google.common"/>
+  <allow pkg="com.thoughtworks.paranamer"/>

  <subpackage name="util.yaml">
    <allow pkg="org.yaml.snakeyaml"/>