From 26774e3ca7218a147f88cadc28214986f2a61728 Mon Sep 17 00:00:00 2001
From: "Taro L. Saito" <leo@xerial.org>
Date: Sat, 4 Jun 2011 10:35:19 +0900
Subject: [PATCH] Resolve native lib version collectly by referring VERSION
 file

---
 pom.xml                                         | 7 ++++++-
 src/main/java/org/xerial/snappy/LoadSnappy.java | 5 +++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0dfe462..d1d4952 100755
--- a/pom.xml
+++ b/pom.xml
@@ -13,6 +13,12 @@
 
   <build>
     <resources>
+      <resource>
+        <directory>src/main/java</directory>
+        <includes>
+          <include>org/xerial/snappy/VERSION</include>
+        </includes>
+      </resource>
       <resource>
         <directory>src/main/resources</directory>
         <includes>
@@ -23,7 +29,6 @@
         <directory>${basedir}</directory>
         <targetPath>META-INF/maven/${project.groupId}/${project.artifactId}</targetPath>
         <includes>
-          <include>VERSION</include>
           <include>LICENSE*</include>
         </includes>
       </resource>
diff --git a/src/main/java/org/xerial/snappy/LoadSnappy.java b/src/main/java/org/xerial/snappy/LoadSnappy.java
index d8bb1fa..b09d73b 100755
--- a/src/main/java/org/xerial/snappy/LoadSnappy.java
+++ b/src/main/java/org/xerial/snappy/LoadSnappy.java
@@ -96,7 +96,6 @@ public class LoadSnappy
             String targetFolder) {
         String nativeLibraryFilePath = libFolderForCurrentOS + "/" + libraryFileName;
         final String prefix = "snappy-" + getVersion() + "-";
-
         String extractedLibFileName = prefix + libraryFileName;
         File extractedLibFile = new File(targetFolder, extractedLibFileName);
 
@@ -226,7 +225,7 @@ public class LoadSnappy
 
         URL versionFile = LoadSnappy.class.getResource("/META-INF/maven/org.xerial.snappy/snappy-java/pom.properties");
         if (versionFile == null)
-            versionFile = LoadSnappy.class.getResource("/META-INF/maven/org.xerial.snappy/snappy-java/VERSION");
+            versionFile = LoadSnappy.class.getResource("/org/xerial/snappy/VERSION");
 
         String version = "unknown";
         try {
@@ -234,6 +233,8 @@ public class LoadSnappy
                 Properties versionData = new Properties();
                 versionData.load(versionFile.openStream());
                 version = versionData.getProperty("version", version);
+                if (version.equals("unknown"))
+                    version = versionData.getProperty("VERSION", version);
                 version = version.trim().replaceAll("[^0-9\\.]", "");
             }
         }