Add the feature for checking whether entry belongs to config or not

sdeleuze · Apr 21, 2023 · 0e6e917 · 0e6e917
1 parent 0dd032e
commit 0e6e917
Show file tree

Hide file tree

Showing 9 changed files with 1,221 additions and 808 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -59,12 +59,18 @@ Every metadata has an entry in the `metadata/index.json`. For example:
     "module": "org.example:dependant-library",
     "requires": [
       "org.example:library"
-    ]
+    ], 
+    "allowed-packages": [
+       "org.package.name"
+     ]
   }
 ]
 ```
 
-Note that `dependant-library` can feature its own metadata as well if `directory` key is specified.
+**Note:** `dependant-library` can feature its own metadata as well if `directory` key is specified.
+
+**Note:** `allowed-packages` describes which packages are expected to contain metadata entries. This way you can prevent metadata from other libraries to be
+pulled into your config files
 
 Every library metadata has another `index.json` file.
 In aforementioned case that would be `metadata/org.example/library/index.json`.

diff --git a/metadata/com.sun.mail/jakarta.mail/2.0.1/reflect-config.json b/metadata/com.sun.mail/jakarta.mail/2.0.1/reflect-config.json
@@ -27,13 +27,6 @@
     "allDeclaredConstructors": true,
     "name": "com.sun.mail.handlers.message_rfc822"
   },
-  {
-    "condition": {
-      "typeReachable": "jakarta.activation.MailcapCommandMap"
-    },
-    "allDeclaredConstructors": true,
-    "name": "com.sun.mail.handlers.message_rfc822"
-  },
   {
     "condition": {
       "typeReachable": "jakarta.activation.MailcapCommandMap"

diff --git a/metadata/com.sun.mail/jakarta.mail/2.0.1/resource-config.json b/metadata/com.sun.mail/jakarta.mail/2.0.1/resource-config.json
@@ -1,24 +1,41 @@
-
 {
   "resources": {
     "includes": [
       {
-        "pattern": "\\QMETA-INF/hk2-locator/default\\E"
+        "pattern": "\\QMETA-INF/hk2-locator/default\\E",
+        "condition": {
+          "typeReachable": "jakarta.mail.Session"
+        }
       },
       {
-        "pattern": "\\QMETA-INF/gfprobe-provider.xml\\E"
+        "pattern": "\\QMETA-INF/gfprobe-provider.xml\\E",
+        "condition": {
+          "typeReachable": "jakarta.mail.Session"
+        }
       },
       {
-        "pattern": "\\QMETA-INF/javamail.charset.map\\E"
+        "pattern": "\\QMETA-INF/javamail.charset.map\\E",
+        "condition": {
+          "typeReachable": "jakarta.mail.Session"
+        }
       },
       {
-        "pattern": "\\QMETA-INF/javamail.default.address.map\\E"
+        "pattern": "\\QMETA-INF/javamail.default.address.map\\E",
+        "condition": {
+          "typeReachable": "jakarta.mail.Session"
+        }
       },
       {
-        "pattern": "\\QMETA-INF/javamail.default.providers\\E"
+        "pattern": "\\QMETA-INF/javamail.default.providers\\E",
+        "condition": {
+          "typeReachable": "jakarta.mail.Session"
+        }
       },
       {
-        "pattern": "\\QMETA-INF/mailcap\\E"
+        "pattern": "\\QMETA-INF/mailcap\\E",
+        "condition": {
+          "typeReachable": "jakarta.mail.Session"
+        }
       }
     ]
   }

diff --git a/metadata/com.zaxxer/HikariCP/5.0.1/jni-config.json b/metadata/com.zaxxer/HikariCP/5.0.1/jni-config.json
@@ -1,5 +1,8 @@
 [
   {
+    "condition": {
+      "typeReachable": "java.lang.ClassLoader"
+    },
     "name": "java.lang.ClassLoader",
     "methods": [
       {
@@ -15,6 +18,9 @@
     ]
   },
   {
+    "condition": {
+      "typeReachable": "jdk.internal.loader.ClassLoaders"
+    },
     "name": "jdk.internal.loader.ClassLoaders$PlatformClassLoader"
   }
 ]