Load branch specific UUID library

diff --git a/org.argeo.api.uuid/src/org/argeo/api/uuid/libuuid/APM.java b/org.argeo.api.uuid/src/org/argeo/api/uuid/libuuid/APM.java
new file mode 100644 (file)
index 0000000..c91668d
--- /dev/null
+++ b/org.argeo.api.uuid/src/org/argeo/api/uuid/libuuid/APM.java
@@ -0,0 +1,15 @@
+package org.argeo.api.uuid.libuuid;
+
+import java.io.Serializable;
+
+/** Package metadata for this package. */
+class APM implements Serializable {
+       /** Major version (equality means backward compatibility). */
+       static final int MAJOR = 2;
+       /** Minor version (if even, equality means forward compatibility). */
+       static final int MINOR = 3;
+       /** serialVersionUID to use for {@link Serializable} classes in this package. */
+       static final long SERIAL = (long) MAJOR << 32 | MINOR & 0xFFFFFFFFL;
+       /** Metadata version. */
+       private static final long serialVersionUID = 2L;
+}

diff --git a/org.argeo.api.uuid/src/org/argeo/api/uuid/libuuid/LibuuidFactory.java b/org.argeo.api.uuid/src/org/argeo/api/uuid/libuuid/LibuuidFactory.java
index dd54c8159cddf304581df7ee04328ebdc8a000df..ea10de199efad3912f722d9bb91129a31f672bbe 100644 (file)
--- a/org.argeo.api.uuid/src/org/argeo/api/uuid/libuuid/LibuuidFactory.java
+++ b/org.argeo.api.uuid/src/org/argeo/api/uuid/libuuid/LibuuidFactory.java
@@ -8,7 +8,7 @@ import org.argeo.api.uuid.UuidFactory;
 /** An {@link UuidFactory} based on a native library. */
 public class LibuuidFactory implements UuidFactory, TypedUuidFactory {
        static {
-               System.loadLibrary("Java_org_argeo_api_uuid_libuuid");
+               System.loadLibrary("Java_org_argeo_api_uuid_libuuid." + APM.MAJOR + "." + APM.MINOR);
        }
 
        @Override